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

[Chris Wilson]

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

New commits:
commit cac7c8dc4b154d37ff27430aa7b714ac84f3d092
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Jun 25 10:36:38 2016 +0100

    sna: Skip wait_for_shadow() when shadow is temporarily disabled
    
    When recursing, we guard against unwanted waits by temporarily disabling
    the shadow. For the most part, we actually defer the wait to avoid
    recursion, but in a few instances detecting the recursion is hard (e.g.
    finishing a vblank and then performing the FakeFront copy). Here, we
    just ignore shadow (it should only be a read of valid data) and exit to
    avoid the assertion.
    
    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 5785757..2ec9835 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -1538,9 +1538,11 @@ static bool wait_for_shadow(struct sna *sna,
 	assert(priv->move_to_gpu_data == sna);
 	assert(sna->mode.shadow != priv->gpu_bo);
 
-	if (flags == 0 || pixmap != sna->front || !sna->mode.shadow_enabled)
+	if (flags == 0 || pixmap != sna->front)
 		goto done;
 
+	if (!sna->mode.shadow_enabled)
+		return ret;
 	assert(sna->mode.shadow_damage);
 
 	if ((flags & MOVE_WRITE) == 0) {
commit e827ef7811da992c6cc7bc9553f0f6f68287ce4b
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Jun 25 10:35:59 2016 +0100

    sna: Fixup DBG for sprite rename
    
    A few compiled out DBG escaped the sprite rename.
    
    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 2ef42f1..5785757 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -1288,15 +1288,16 @@ bool sna_crtc_set_sprite_rotation(xf86CrtcPtr crtc,
 {
 	struct plane *sprite;
 	assert(to_sna_crtc(crtc));
-	DBG(("%s: CRTC:%d [pipe=%d], sprite=%u set-rotation=%x\n",
-	     __FUNCTION__,
-	     sna_crtc_id(crtc), sna_crtc_pipe(crtc),
-	     to_sna_crtc(crtc)->sprite.id, rotation));
 
 	sprite = lookup_sprite(to_sna_crtc(crtc), idx);
 	if (!sprite)
 		return false;
 
+	DBG(("%s: CRTC:%d [pipe=%d], sprite=%u set-rotation=%x\n",
+	     __FUNCTION__,
+	     sna_crtc_id(crtc), sna_crtc_pipe(crtc),
+	     sprite->id, rotation));
+
 	return rotation_set(to_sna(crtc->scrn), sprite,
 			    rotation_reduce(sprite, rotation));
 }
@@ -3351,10 +3352,9 @@ sna_crtc_add(ScrnInfoPtr scrn, unsigned id)
 	sna_crtc_init__rotation(sna, sna_crtc);
 	sna_crtc_find_planes(sna, sna_crtc);
 
-	DBG(("%s: CRTC:%d [pipe=%d], primary id=%x: supported-rotations=%x, current-rotation=%x, sprite id=%x: supported-rotations=%x, current-rotation=%x\n",
+	DBG(("%s: CRTC:%d [pipe=%d], primary id=%x: supported-rotations=%x, current-rotation=%x\n",
 	     __FUNCTION__, id, get_pipe.pipe,
-	     sna_crtc->primary.id, sna_crtc->primary.rotation.supported, sna_crtc->primary.rotation.current,
-	     sna_crtc->sprite.id, sna_crtc->sprite.rotation.supported, sna_crtc->sprite.rotation.current));
+	     sna_crtc->primary.id, sna_crtc->primary.rotation.supported, sna_crtc->primary.rotation.current));
 
 	list_init(&sna_crtc->shadow_link);
 
@@ -3558,7 +3558,7 @@ static void sna_output_set_parsed_edid(xf86OutputPtr output, xf86MonPtr mon)
 
 	if (output->mm_width != conn_mm_width || output->mm_height != conn_mm_height) {
 		DBG(("%s)%s): kernel and Xorg disagree over physical size: kernel=%dx%dmm, Xorg=%dx%dmm\n",
-		     __FUNCION__, output->name,
+		     __FUNCTION__, output->name,
 		     conn_mm_width, conn_mm_height,
 		     output->mm_width, output->mm_height));
 	}