From 557ffa3bacd8e673fe8d4f141a74b037eb9de095 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 13 Mar 2015 12:08:04 +0000
Subject: [PATCH] sna: Cross check that we only have an affine transformation
 for HW cursors

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 src/sna/sna_display.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index a71edb1f..71988cd3 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;