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

[Chris Wilson]

 src/sna/sna_display.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 90792c933d9a6160e6646121cfe79ee857f70655
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Apr 3 20:16:47 2016 +0100

    sna: Only print "Failed to prepare CRTC ... disabling TearFree" once
    
    The actual disablement doesn't take place until the next modeset, and
    until then we are likely to keep spamming the error message.
    
    References: https://bugs.freedesktop.org/show_bug.cgi?id=94806
    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 6cb10e6..8de65dc 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -8937,9 +8937,11 @@ fixup_flip:
 					crtc->bo = kgem_bo_reference(flip_bo);
 					crtc->bo->active_scanout++;
 				} else {
-					xf86DrvMsg(sna->scrn->scrnIndex, X_ERROR,
-						   "Failed to prepare CRTC for page flipping, disabling TearFree\n");
-					sna->flags &= ~SNA_TEAR_FREE;
+					if (sna->flags & SNA_TEAR_FREE) {
+						xf86DrvMsg(sna->scrn->scrnIndex, X_ERROR,
+								"Failed to prepare CRTC for page flipping, disabling TearFree\n");
+						sna->flags &= ~SNA_TEAR_FREE;
+					}
 
 					if (sna->mode.flip_active == 0) {
 						DBG(("%s: abandoning flip attempt\n", __FUNCTION__));