openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-11 03:39:26 +00:00
Code Issues Projects 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 and sparc64.  Already
merged upstream.

ok matthieu@, no objection miod@
This commit is contained in:
kettenis
2011-02-21 19:28:39 +00:00
parent d5f91100d2
commit e2f9a8fd0b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
driver/xf86-video-ati/src/radeon_driver.c
View File

@@ -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);
}