[xorg-x11-drv-intel/f18] Fix damage issue for reverse prime work

[Dave Airlie]

commit 76ccb15616ba6df6d0d19121d9566122bcaf1de4
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Jan 8 13:36:42 2013 +1000

    Fix damage issue for reverse prime work

 0001-fix-damage.patch   |   34 ++++++++++++++++++++++++++++++++++
 xorg-x11-drv-intel.spec |    7 ++++++-
 2 files changed, 40 insertions(+), 1 deletions(-)
---
diff --git a/0001-fix-damage.patch b/0001-fix-damage.patch
new file mode 100644
index 0000000..3aa640c
--- /dev/null
+++ b/0001-fix-damage.patch
@@ -0,0 +1,34 @@
+diff --git a/src/intel_driver.c b/src/intel_driver.c
+index 5d3e103..d22c063 100644
+--- a/src/intel_driver.c
++++ b/src/intel_driver.c
+@@ -696,6 +696,7 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty)
+ 
+ 	PixmapRegionInit(&pixregion, dirty->slave_dst->master_pixmap);
+ 
++	DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion);
+ 	PixmapSyncDirtyHelper(dirty, &pixregion);
+ 	intel_batch_submit(scrn);
+ 	if (!intel->has_prime_vmap_flush) {
+@@ -704,9 +705,10 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty)
+ 		drm_intel_bo_map(bo, FALSE);
+ 		drm_intel_bo_unmap(bo);
+ 		xf86UnblockSIGIO(was_blocked);
+-        }
+-        DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion);
+-        RegionUninit(&pixregion);
++	}
++	DamageRegionProcessPending(&dirty->slave_dst->drawable);
++
++	RegionUninit(&pixregion);
+ 	return 0;
+ }
+ 
+@@ -719,7 +721,6 @@ intel_dirty_update(ScreenPtr screen)
+ 	if (xorg_list_is_empty(&screen->pixmap_dirty_list))
+ 	    return;
+ 
+-	ErrorF("list is not empty\n");
+ 	xorg_list_for_each_entry(ent, &screen->pixmap_dirty_list, ent) {
+ 		region = DamageRegion(ent->damage);
+ 		if (RegionNotEmpty(region)) {
diff --git a/xorg-x11-drv-intel.spec b/xorg-x11-drv-intel.spec
index 0647e69..ce47cea 100644
--- a/xorg-x11-drv-intel.spec
+++ b/xorg-x11-drv-intel.spec
@@ -18,7 +18,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.20.17
-Release:   1%{?gitrev}%{?dist}
+Release:   2%{?gitrev}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -33,6 +33,7 @@ Source3:    intel-gpu-tools-%{gputoolsdate}.tar.bz2
 Source4:    make-git-snapshot.sh
 
 Patch0: 0001-uxa-Align-surface-allocations-to-even-tile-rows.patch
+Patch1: 0001-fix-damage.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -78,6 +79,7 @@ Debugging tools for Intel graphics chips
 %prep
 %setup -q -n xf86-video-intel-%{?gitdate:%{gitdate}}%{!?gitdate:%{dirsuffix}} -b3
 %patch0 -p1 -b .uxafix
+%patch1 -p1 -b .dmg
 
 %build
  
@@ -144,6 +146,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Tue Jan 08 2013 Dave Airlie <airlied at redhat.com> 2.20.17-2
+- Fix damage issue for reverse prime work
+
 * Fri Jan 04 2013 Adam Jackson <ajax at redhat.com> 2.20.17-1
 - intel 2.20.17