qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Restore the CLOCK_CNTL_INDEX *after* we're done messing with it. Makes Xorg

Browse Source 
properly restore the video mode upon exit on macppc.

ok matthieu@, deraadt@
This commit is contained in:
kettenis 2011-02-28 19:17:12 +00:00
parent c5cdf7be69
commit 0c02cbb205
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
driver/xf86-video-r128/src/r128_driver.c
View File

@ -3308,6 +3308,8 @@ static void R128Restore(ScrnInfoPtr pScrn)
R128Blank(pScrn); R128Blank(pScrn);
R128RestoreMode(pScrn, restore);
if (!info->IsSecondary) { if (!info->IsSecondary) {
OUTREG(R128_AMCGPIO_MASK, restore->amcgpio_mask); OUTREG(R128_AMCGPIO_MASK, restore->amcgpio_mask);
OUTREG(R128_AMCGPIO_EN_REG, restore->amcgpio_en_reg); OUTREG(R128_AMCGPIO_EN_REG, restore->amcgpio_en_reg);
@ -3316,7 +3318,6 @@ static void R128Restore(ScrnInfoPtr pScrn)
OUTREG(R128_DP_DATATYPE, restore->dp_datatype); OUTREG(R128_DP_DATATYPE, restore->dp_datatype);
} }
R128RestoreMode(pScrn, restore);
#ifdef WITH_VGAHW #ifdef WITH_VGAHW
if (info->VGAAccess) { if (info->VGAAccess) {
vgaHWPtr hwp = VGAHWPTR(pScrn); vgaHWPtr hwp = VGAHWPTR(pScrn);