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

[Chris Wilson]

 src/sna/sna_display.c |    1 +
 src/sna/sna_driver.c  |   50 ++++++++++++++++++++++++++++++--------------------
 2 files changed, 31 insertions(+), 20 deletions(-)

New commits:
commit 653b8a4d83210187f6ef90f017598d8ebb45de27
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Jan 22 16:36:27 2015 +0000

    sna: Declare outputs as hidden at start
    
    Required for our internal bookkeeping of DPMS events.
    
    Reported-by: Jiri Slaby <jirislaby:gmail.com>
    References: https://bugs.freedesktop.org/show_bug.cgi?id=70461#c79
    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 684256a..00c93d4 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -5902,6 +5902,7 @@ bool sna_mode_pre_init(ScrnInfoPtr scrn, struct sna *sna)
 	}
 
 	probe_capabilities(sna);
+	sna->mode.hidden = 1;
 
 	if (!xf86GetOptValInteger(sna->Options, OPTION_VIRTUAL, &num_fake))
 		num_fake = 1;
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index 4921bea..fc6afad 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -290,6 +290,7 @@ static void sna_dpms_set(ScrnInfoPtr scrn, int mode, int flags)
 {
 	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
 	struct sna *sna = to_sna(scrn);
+	bool changed = false;
 	int i;
 
 	DBG(("%s(mode=%d, flags=%d), vtSema=%d\n",
@@ -306,32 +307,41 @@ static void sna_dpms_set(ScrnInfoPtr scrn, int mode, int flags)
 	 * back on.
 	 */
 	if (mode == DPMSModeOff) {
-		for (i = 0; i < config->num_output; i++) {
-			xf86OutputPtr output = config->output[i];
-			if (output->crtc != NULL)
-				output->funcs->dpms(output, mode);
+		if (sna->mode.hidden == 0) {
+			for (i = 0; i < config->num_output; i++) {
+				xf86OutputPtr output = config->output[i];
+				if (output->crtc != NULL)
+					output->funcs->dpms(output, mode);
+			}
+			sna->mode.hidden = sna->mode.front_active + 1;
+			sna->mode.front_active = 0;
+			changed = true;
 		}
-		sna->mode.hidden = sna->mode.front_active + 1;
-		sna->mode.front_active = 0;
 	} else {
-		/* Re-enable CRTC that have been forced off via other means */
-		sna->mode.front_active = sna->mode.hidden - 1;
-		sna->mode.hidden = 0;
-		for (i = 0; i < config->num_crtc; i++) {
-			xf86CrtcPtr crtc = config->crtc[i];
-			if (crtc->enabled)
-				crtc->funcs->dpms(crtc, mode);
-		}
+		if (sna->mode.hidden != 0) {
+			/* Re-enable CRTC that have been forced off via other means */
+			sna->mode.front_active = sna->mode.hidden - 1;
+			sna->mode.hidden = 0;
+			for (i = 0; i < config->num_crtc; i++) {
+				xf86CrtcPtr crtc = config->crtc[i];
+				if (crtc->enabled)
+					crtc->funcs->dpms(crtc, mode);
+			}
 
-		for (i = 0; i < config->num_output; i++) {
-			xf86OutputPtr output = config->output[i];
-			if (output->crtc != NULL)
-				output->funcs->dpms(output, mode);
+			for (i = 0; i < config->num_output; i++) {
+				xf86OutputPtr output = config->output[i];
+				if (output->crtc != NULL)
+					output->funcs->dpms(output, mode);
+			}
+			changed = true;
 		}
 	}
 
-	sna_crtc_config_notify(xf86ScrnToScreen(scrn));
-	DBG(("%s: hiding outputs? %d\n", __FUNCTION__, sna->mode.hidden));
+	DBG(("%s: hiding outputs? %d, front active? %d, changed? %d\n",
+	     __FUNCTION__, sna->mode.hidden, sna->mode.front_active, changed));
+
+	if (changed)
+		sna_crtc_config_notify(xf86ScrnToScreen(scrn));
 }
 
 static Bool sna_save_screen(ScreenPtr screen, int mode)