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

[Chris Wilson]

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

New commits:
commit bc84ba6f97b2cdd5d9f2d0c4b5c7b6532ed5d0e6
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Mar 13 12:12:21 2015 +0000

    sna: Fix computation of transformed cursor size
    
    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 71988cd..0352a71 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -4872,7 +4872,7 @@ static struct sna_cursor *__sna_get_cursor(struct sna *sna, xf86CrtcPtr crtc)
 		box.x2 = sna->cursor.ref->bits->width;
 		box.y2 = sna->cursor.ref->bits->height;
 
-		pixman_f_transform_bounds(&crtc->f_framebuffer_to_crtc, &box);
+		pixman_f_transform_bounds(&crtc->f_crtc_to_framebuffer, &box);
 		size = __cursor_size(box.x2 - box.x1, box.y2 - box.y1);
 
 		RRTransformCompute(0, 0,
@@ -5364,7 +5364,7 @@ transformable_cursor(struct sna *sna, CursorPtr cursor)
 		if (!to_sna_crtc(crtc)->cursor_transform)
 			return false;
 
-		t = &crtc->f_framebuffer_to_crtc;
+		t = &crtc->f_crtc_to_framebuffer;
 		if (!sna->cursor.use_gtt || !sna->cursor.scratch)
 			return false;
 
commit 557ffa3bacd8e673fe8d4f141a74b037eb9de095
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Mar 13 12:08:04 2015 +0000

    sna: Cross check that we only have an affine transformation for HW cursors
    
    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 a71edb1..71988cd 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -5353,15 +5353,18 @@ transformable_cursor(struct sna *sna, CursorPtr cursor)
 	int i;
 
 	for (i = 0; i < sna->mode.num_real_crtc; i++) {
-		struct sna_crtc *crtc = to_sna_crtc(config->crtc[i]);
+		xf86CrtcPtr crtc = config->crtc[i];
 		const struct pixman_f_transform *t;
 		struct pixman_box16 box;
 		int size;
 
-		if (!crtc->cursor_transform)
+		if (!crtc->transform_in_use)
 			continue;
 
-		t = &crtc->base->f_framebuffer_to_crtc;
+		if (!to_sna_crtc(crtc)->cursor_transform)
+			return false;
+
+		t = &crtc->f_framebuffer_to_crtc;
 		if (!sna->cursor.use_gtt || !sna->cursor.scratch)
 			return false;