[PATCH xf86-video-r128] Restore the CLOCK_CNTL_INDEX *after* we're done messing with it.

Matthieu Herrb matthieu.herrb at laas.fr
Sun Jan 1 11:01:33 PST 2012


From: Mark Kettenis <kettenis at cvs.openbsd.org>

Makes Xorg properly restore the video mode upon exit on OpenBSD/macppc.

Signed-off-by: Matthieu Herrb <matthieu.herrb at laas.fr>
---
 src/r128_driver.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/r128_driver.c b/src/r128_driver.c
index 9608259..edfd3ad 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -3292,6 +3292,8 @@ static void R128Restore(ScrnInfoPtr pScrn)
 
     R128Blank(pScrn);
 
+    R128RestoreMode(pScrn, restore);
+
     if (!info->IsSecondary) {
         OUTREG(R128_AMCGPIO_MASK,     restore->amcgpio_mask);
         OUTREG(R128_AMCGPIO_EN_REG,   restore->amcgpio_en_reg);
@@ -3300,7 +3302,6 @@ static void R128Restore(ScrnInfoPtr pScrn)
         OUTREG(R128_DP_DATATYPE,      restore->dp_datatype);
     }
 
-    R128RestoreMode(pScrn, restore);
 #ifdef WITH_VGAHW
     if (info->VGAAccess) {
         vgaHWPtr hwp = VGAHWPTR(pScrn);
-- 
1.7.6



More information about the xorg-devel mailing list