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

[Chris Wilson]

 src/sna/sna_display.c      |   50 ++++++++++++++++++++++++++++-----------------
 src/sna/sna_display_fake.c |   11 ---------
 2 files changed, 32 insertions(+), 29 deletions(-)

New commits:
commit 4950bc4fea80d44dde798f3f8b5a07eee1555a63
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Apr 10 22:26:42 2014 +0100

    sna: Only reload an active HW cursor
    
    Do not attempt to restore the cursor handle if a SW cursor is currently
    active. In particular, this prevents a crash after modesetting if we
    never had a real cursor (for example output offloading).
    
    Reported-by: Tomas Pruzina <pruzinat at gmail.com>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77283
    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 0b03cfa..ee94806 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -3124,8 +3124,7 @@ static struct sna_cursor *__sna_get_cursor(struct sna *sna, xf86CrtcPtr crtc)
 	int width, height, size, x, y;
 	Rotation rotation;
 
-	if (sna->cursor.ref == NULL || sna->cursor.ref->bits == NULL)
-		return NULL;
+	assert(sna->cursor.ref);
 
 	cursor = to_sna_crtc(crtc)->cursor;
 	__DBG(("%s: current cursor handle=%d, serial=%d [expected %d]\n",
@@ -3265,7 +3264,7 @@ static struct sna_cursor *__sna_get_cursor(struct sna *sna, xf86CrtcPtr crtc)
 static unsigned char *
 sna_realize_cursor(xf86CursorInfoPtr info, CursorPtr cursor)
 {
-	return NULL;
+	return (unsigned char *)1;
 }
 
 #if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,12,99,901,0)
@@ -3299,6 +3298,8 @@ sna_show_cursors(ScrnInfoPtr scrn)
 	int sigio, c;
 
 	__DBG(("%s\n", __FUNCTION__));
+	if (sna->cursor.ref == NULL)
+		return;
 
 	sigio = sigio_block();
 	for (c = 0; c < xf86_config->num_crtc; c++) {
@@ -3411,6 +3412,7 @@ sna_set_cursor_position(ScrnInfoPtr scrn, int x, int y)
 	int sigio, c;
 
 	__DBG(("%s(%d, %d)\n", __FUNCTION__, x, y));
+	assert(sna->cursor.ref);
 
 	sigio = sigio_block();
 	sna->cursor.last_x = x;
@@ -3533,23 +3535,30 @@ sna_use_hw_cursor(ScreenPtr screen, CursorPtr cursor)
 	struct sna *sna = to_sna_from_screen(screen);
 
 	/* cursors are invariant */
-	if (cursor != sna->cursor.ref) {
-		cursor->refcnt++;
-		if (sna->cursor.ref)
-			FreeCursor(sna->cursor.ref, None);
-		sna->cursor.ref = cursor;
-		sna->cursor.size = __cursor_size(cursor);
-		sna->cursor.serial++;
+	if (cursor == sna->cursor.ref)
+		return TRUE;
 
-		__DBG(("%s(%dx%d): ARGB?=%d, serial->%d, size->%d\n", __FUNCTION__,
-		       cursor->bits->width,
-		       cursor->bits->height,
-		       cursor->bits->argb!=NULL,
-		       sna->cursor.serial,
-		       sna->cursor.size));
+	if (sna->cursor.ref) {
+		FreeCursor(sna->cursor.ref, None);
+		sna->cursor.ref = NULL;
 	}
 
-	return sna->cursor.size <= sna->cursor.max_size;
+	sna->cursor.size = __cursor_size(cursor);
+	if (sna->cursor.size > sna->cursor.max_size)
+		return FALSE;
+
+	sna->cursor.ref = cursor;
+	cursor->refcnt++;
+	sna->cursor.serial++;
+
+	__DBG(("%s(%dx%d): ARGB?=%d, serial->%d, size->%d\n", __FUNCTION__,
+	       cursor->bits->width,
+	       cursor->bits->height,
+	       cursor->bits->argb!=NULL,
+	       sna->cursor.serial,
+	       sna->cursor.size));
+
+	return TRUE;
 }
 
 static void
@@ -3623,7 +3632,12 @@ sna_cursors_init(ScreenPtr screen, struct sna *sna)
 static void
 sna_cursors_reload(struct sna *sna)
 {
-	sna_set_cursor_position(sna->scrn, sna->cursor.last_x, sna->cursor.last_y);
+	if (sna->cursor.ref == NULL)
+		return;
+
+	sna_set_cursor_position(sna->scrn,
+				sna->cursor.last_x,
+				sna->cursor.last_y);
 }
 
 static void
commit 8e6e7dbc9257a223ab284198e92f263a1a8b5553
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Apr 10 21:44:35 2014 +0100

    sna: Don't create slave pixmaps for the virtual CRTC
    
    They only exist as placeholders for remote outputs in the framebuffer
    and do not need to take part in actually output offloading, so we can
    forgo creating slave pixmaps and remove the stub function entirely.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_display_fake.c b/src/sna/sna_display_fake.c
index 4728b86..8604d20 100644
--- a/src/sna/sna_display_fake.c
+++ b/src/sna/sna_display_fake.c
@@ -106,22 +106,11 @@ sna_crtc_destroy(xf86CrtcPtr crtc)
 {
 }
 
-#if HAS_PIXMAP_SHARING
-static Bool
-sna_crtc_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr pixmap)
-{
-	return TRUE;
-}
-#endif
-
 static const xf86CrtcFuncsRec sna_crtc_funcs = {
 	.dpms = sna_crtc_dpms,
 	.set_mode_major = sna_crtc_set_mode_major,
 	.gamma_set = sna_crtc_gamma_set,
 	.destroy = sna_crtc_destroy,
-#if HAS_PIXMAP_SHARING
-	.set_scanout_pixmap = sna_crtc_set_scanout_pixmap,
-#endif
 };
 
 static void