xf86-video-intel: src/sna/sna_display.c

[Chris Wilson]

 src/sna/sna_display.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bfd0e41d5c7b8bff28ff429b26f4c977e4c37d12
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon May 19 12:31:49 2014 +0100

    sna: Fix assertions for combining shadow transforms and TearFree
    
    When the RandR shadow buffer is enabled we set the sna_crtc->transform
    flag. We set the crtc->transform_in_use only when coordinate transforms
    are required - i.e. we may enable the shadow buffer if a CRTC is out of
    bounds, but otherwise has no transformation. That confused the asserts.
    
    Reported-by: Zdenek Kabelac <zkabelac at redhat.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 632d9f8..5671db5 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -5401,7 +5401,7 @@ void sna_mode_redisplay(struct sna *sna)
 				continue;
 
 			assert(crtc->enabled);
-			assert(crtc->transform_in_use || sna->flags & SNA_TEAR_FREE);
+			assert(sna_crtc->transform || sna->flags & SNA_TEAR_FREE);
 
 			damage.extents = crtc->bounds;
 			damage.data = NULL;
@@ -5453,7 +5453,7 @@ void sna_mode_redisplay(struct sna *sna)
 			continue;
 
 		assert(crtc->enabled);
-		assert(crtc->transform_in_use);
+		assert(sna_crtc->transform);
 
 		damage.extents = crtc->bounds;
 		damage.data = NULL;