xf86-video-intel: 2 commits - src/intel_driver.c

[Dave Airlie]

 src/intel_driver.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit c789d06cf8a0debc67058d7be1483f5b542e2baa
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Jan 7 13:57:21 2013 +1000

    intel: fixup damage posting to be done correctly around slave pixmap
    
    This fixes the damage posting to happen in the correct ordering,
    not sure if this fixes anything, but it should make things more consistent.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/src/intel_driver.c b/src/intel_driver.c
index a5bc415..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;
 }
 
commit 5891c89ff2be277d1a833d4bc092b65184c1f3d6
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Jan 7 13:54:47 2013 +1000

    intel: drop pointless error printf in the slave pixmap sync code.
    
    This is left over and spams logs, get rid.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/src/intel_driver.c b/src/intel_driver.c
index 5d3e103..a5bc415 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -719,7 +719,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)) {