From e293991f408ba7ba4fd02b7bcfeff0051f9eb8f4 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 18 Feb 2015 09:59:58 +0000 Subject: [PATCH] sna: Reuse the old cursor on the current CRTC We only want to prevent sharing of physical handles across CRTC (on old kernels). If we already have one assigned to a CRTC we know that it is unshared and can keep using it. Signed-off-by: Chris Wilson --- src/sna/sna_display.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c index de0cbec1..b9845506 100644 --- a/src/sna/sna_display.c +++ b/src/sna/sna_display.c @@ -4674,11 +4674,10 @@ static struct sna_cursor *__sna_get_cursor(struct sna *sna, xf86CrtcPtr crtc) return cursor; } } - - cursor = to_sna_crtc(crtc)->cursor; } size = sna->cursor.size; + cursor = to_sna_crtc(crtc)->cursor; if (cursor && cursor->alloc < 4*size*size) cursor = NULL;