Module Name: xsrc
Committed By: macallan
Date: Wed Jul 29 19:27:37 UTC 2015
Modified Files:
xsrc/external/mit/xf86-video-r128/dist/src: r128_driver.c
Log Message:
restore some more registers on exit, now we actually get back to a usable
console
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
diff -u xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.15 xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.16
--- xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.15 Wed Jul 29 18:15:38 2015
+++ xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c Wed Jul 29 19:27:37 2015
@@ -2797,15 +2797,11 @@ static void R128Restore(ScrnInfoPtr pScr
R128RestoreFPRegisters(pScrn, restore);
R128RestoreLVDSRegisters(pScrn, restore);
-#if 0
- if (!info->IsSecondary) {
- OUTREG(R128_AMCGPIO_MASK, restore->amcgpio_mask);
- OUTREG(R128_AMCGPIO_EN_REG, restore->amcgpio_en_reg);
- OUTREG(R128_CLOCK_CNTL_INDEX, restore->clock_cntl_index);
- OUTREG(R128_GEN_RESET_CNTL, restore->gen_reset_cntl);
- OUTREG(R128_DP_DATATYPE, restore->dp_datatype);
- }
-#endif
+ OUTREG(R128_AMCGPIO_MASK, restore->amcgpio_mask);
+ OUTREG(R128_AMCGPIO_EN_REG, restore->amcgpio_en_reg);
+ OUTREG(R128_CLOCK_CNTL_INDEX, restore->clock_cntl_index);
+ OUTREG(R128_GEN_RESET_CNTL, restore->gen_reset_cntl);
+ OUTREG(R128_DP_DATATYPE, restore->dp_datatype);
#ifdef WITH_VGAHW
if (info->VGAAccess) {
