RADEON: always restore crtc1 before crtc0 when using both crtcs

In some rare cases restoring crtc0 first will result in a blank screen
on crtc1.  If you are having issues with a blank screen on crtc1
that used to work on 6.6.3 or before, this should help.

1 files changed, 17 insertions, 0 deletions

diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c
index e1e45502..d21612a5 100644
--- a/src/radeon_crtc.c
+++ b/src/radeon_crtc.c
@@ -68,11 +68,28 @@ static void
 radeon_crtc_dpms(xf86CrtcPtr crtc, int mode)
 {
     RADEONInfoPtr info = RADEONPTR(crtc->scrn);
+    RADEONEntPtr pRADEONEnt = RADEONEntPriv(crtc->scrn);
+    RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private;
+    xf86CrtcPtr crtc0 = pRADEONEnt->pCrtc[0];
 
     if (IS_AVIVO_VARIANT) {
 	atombios_crtc_dpms(crtc, mode);
     } else {
+
+	/* need to restore crtc1 before crtc0 or we may get a blank screen
+	 * in some cases
+	 */
+	if ((radeon_crtc->crtc_id == 1) && (mode == DPMSModeOn)) {
+	    if (crtc0->enabled)
+		crtc0->funcs->dpms(crtc0, DPMSModeOff);
+	}
+
 	legacy_crtc_dpms(crtc, mode);
+
+	if ((radeon_crtc->crtc_id == 1) && (mode == DPMSModeOn)) {
+	    if (crtc0->enabled)
+		crtc0->funcs->dpms(crtc0, mode);
+	}
     }
 }