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

[Chris Wilson]

 src/sna/sna_display.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 952e3dcba3a651d22d44dbb039ad97e111d9bc63
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon May 21 19:48:52 2012 +0100

    sna: Only override active on DPMSModeOff
    
    Along the enable path we then only want to change the value if we
    actually call sna_crtc_apply.
    
    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 002eba3..e302d70 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -511,9 +511,10 @@ sna_crtc_dpms(xf86CrtcPtr crtc, int mode)
 	DBG(("%s(pipe %d, dpms mode -> %d):= active=%d\n",
 	     __FUNCTION__, sna_crtc->pipe, mode, mode == DPMSModeOn));
 
-	sna_crtc->active = false;
 	if (mode != DPMSModeOff)
 		sna_crtc_restore(sna_crtc->sna);
+	else
+		sna_crtc->active = false;
 }
 
 static struct kgem_bo *sna_create_bo_for_fbcon(struct sna *sna,