diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2011-02-21 19:28:40 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2011-02-21 19:28:40 +0000 |
| commit | 0493089863d73726d0802ec73f87f63f9b67e299 (patch) | |
| tree | a4b61f849fa2b3285ceec9a128b169d823460d48 /driver/xf86-video-ati/src | |
| parent | 7f97ee23100bfa1e10a48a3f582d2c84f29b2996 (diff) | |
Restore the CLOCK_CNTL_INDEX *after* we're done messing with it. Makes Xorg
properly restore the video mode upon exit on macppc and sparc64. Already
merged upstream.
ok matthieu@, no objection miod@
Diffstat (limited to 'driver/xf86-video-ati/src')
| -rw-r--r-- | driver/xf86-video-ati/src/radeon_driver.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/driver/xf86-video-ati/src/radeon_driver.c b/driver/xf86-video-ati/src/radeon_driver.c index 19baa8691..58ab7908c 100644 --- a/driver/xf86-video-ati/src/radeon_driver.c +++ b/driver/xf86-video-ati/src/radeon_driver.c @@ -5225,8 +5225,6 @@ static void RADEONRestore(ScrnInfoPtr pScrn) RADEONRestoreMemMapRegisters(pScrn, restore); avivo_restore(pScrn, restore); } else { - OUTREG(RADEON_CLOCK_CNTL_INDEX, restore->clock_cntl_index); - RADEONPllErrataAfterIndex(info); OUTREG(RADEON_RBBM_SOFT_RESET, restore->rbbm_soft_reset); OUTREG(RADEON_DP_DATATYPE, restore->dp_datatype); OUTREG(RADEON_GRPH_BUFFER_CNTL, restore->grph_buffer_cntl); @@ -5252,6 +5250,9 @@ static void RADEONRestore(ScrnInfoPtr pScrn) RADEONRestoreTVRegisters(pScrn, restore); } + OUTREG(RADEON_CLOCK_CNTL_INDEX, restore->clock_cntl_index); + RADEONPllErrataAfterIndex(info); + RADEONRestoreBIOSRegisters(pScrn, restore); } |