xf86-video-intel: src/i915_video.c

[Chris Wilson]

 src/i915_video.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 142ffa287236adbc3c5f6ead46c63c4c541ace0c
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Jul 22 16:42:26 2010 +0100

    video/i915: ValidateGC after setting clip.
    
    Order is important. And ensure that the scratch GC is performing clip by
    children.
    
    Fixes:
    
      Bug 29213 - video artifacts if used dualscreen mode
      https://bugs.freedesktop.org/show_bug.cgi?id=29213
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/i915_video.c b/src/i915_video.c
index 428ea3d..861bea6 100644
--- a/src/i915_video.c
+++ b/src/i915_video.c
@@ -454,11 +454,11 @@ I915DisplayVideoTextured(ScrnInfoPtr scrn,
 		gc = GetScratchGC(pixmap->drawable.depth,
 				  pixmap->drawable.pScreen);
 		if (gc) {
-			RegionPtr tmp;
-
-			ValidateGC(&pixmap->drawable, gc);
+			gc->subWindowMode = ClipByChildren;
 
 			if (REGION_NUM_RECTS(dstRegion) > 1) {
+				RegionPtr tmp;
+
 				tmp = REGION_CREATE(pixmap->drawable.pScreen, NULL, 0);
 				if (tmp) {
 					REGION_COPY(pixmap->drawable.pScreen, tmp, dstRegion);
@@ -466,6 +466,7 @@ I915DisplayVideoTextured(ScrnInfoPtr scrn,
 				}
 			}
 
+			ValidateGC(&pixmap->drawable, gc);
 			gc->ops->CopyArea(&target->drawable, &pixmap->drawable, gc,
 					  0, 0,
 					  target->drawable.width,