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

[Chris Wilson]

 src/sna/sna_display.c |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 25fa4f5bb4c9ed12755edfeec38b9bdc134736f1
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Apr 10 23:14:32 2014 +0100

    sna: Don't set cursor bits to an invalid pointer
    
    The xf86Cursor core simply frees it, so it has to be NULL.
    
    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 8cbddc2..80b2624 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -3266,7 +3266,7 @@ static struct sna_cursor *__sna_get_cursor(struct sna *sna, xf86CrtcPtr crtc)
 static unsigned char *
 sna_realize_cursor(xf86CursorInfoPtr info, CursorPtr cursor)
 {
-	return (unsigned char *)1;
+	return NULL;
 }
 
 #if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,12,99,901,0)
commit 7b2753f9cc6a1a7ca353f57d78bdf3d52f32864b
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Apr 10 23:11:18 2014 +0100

    sna: Only mark the transform_in_use when required for shadow fb
    
    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 ee94806..8cbddc2 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -1390,17 +1390,19 @@ static void sna_crtc_randr(xf86CrtcPtr crtc)
 	xFixed *params;
 	int nparams;
 	RRTransformPtr transform;
+	int needs_transform;
 
 	transform = NULL;
 	if (crtc->transformPresent)
 		transform = &crtc->transform;
 
-	RRTransformCompute(crtc->x, crtc->y,
-			   crtc->mode.HDisplay, crtc->mode.VDisplay,
-			   crtc->rotation, transform,
-			   &crtc_to_fb,
-			   &f_crtc_to_fb,
-			   &f_fb_to_crtc);
+	needs_transform =
+		RRTransformCompute(crtc->x, crtc->y,
+				   crtc->mode.HDisplay, crtc->mode.VDisplay,
+				   crtc->rotation, transform,
+				   &crtc_to_fb,
+				   &f_crtc_to_fb,
+				   &f_fb_to_crtc);
 
 	filter = NULL;
 	params = NULL;
@@ -1420,7 +1422,7 @@ static void sna_crtc_randr(xf86CrtcPtr crtc)
 				filter = transform->filter;
 		}
 #endif
-		crtc->transform_in_use = TRUE;
+		crtc->transform_in_use = needs_transform;
 	} else
 		crtc->transform_in_use = sna_crtc->rotation != RR_Rotate_0;