diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2011-02-28 19:17:13 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2011-02-28 19:17:13 +0000 |
| commit | d059bb98cf4aca64c2ef777f96a3de375325132d (patch) | |
| tree | 5f0659e403537fa5629d8157fb875647136ba97b /driver/xf86-video-r128 | |
| parent | 59fdc91d520d48ec6680f4926727637490594354 (diff) | |
Restore the CLOCK_CNTL_INDEX *after* we're done messing with it. Makes Xorg
properly restore the video mode upon exit on macppc.
ok matthieu@, deraadt@
Diffstat (limited to 'driver/xf86-video-r128')
| -rw-r--r-- | driver/xf86-video-r128/src/r128_driver.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/driver/xf86-video-r128/src/r128_driver.c b/driver/xf86-video-r128/src/r128_driver.c index d1c91604f..01052ae9e 100644 --- a/driver/xf86-video-r128/src/r128_driver.c +++ b/driver/xf86-video-r128/src/r128_driver.c @@ -3308,6 +3308,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); @@ -3316,7 +3318,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); |