summaryrefslogtreecommitdiff
path: root/src/radeon_driver.c
diff options
context:
space:
mode:
authorAlex Deucher <alex@botch2.(none)>2007-10-03 22:46:21 -0400
committerAlex Deucher <alex@botch2.(none)>2007-10-03 22:46:21 -0400
commit5f5c4e6ad61c45c24f1443b91b4bc5375efdebc0 (patch)
tree98b42fdc7b074e0a8df8dba9b9b60733d0047afa /src/radeon_driver.c
parentbfede412b3a3cd11769a580b167c528734146096 (diff)
RADEON: remove RADEONSaveMode()
It's only called by RADEONSave(), so just move its contents into RADEONSave(). this mirrors RADEONRestore().
Diffstat (limited to 'src/radeon_driver.c')
-rw-r--r--src/radeon_driver.c36
1 files changed, 11 insertions, 25 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index b7e2684b..6668a81c 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -5239,30 +5239,6 @@ static void RADEONSavePalette(ScrnInfoPtr pScrn, RADEONSavePtr save)
}
#endif
-/* Save state that defines current video mode */
-static void RADEONSaveMode(ScrnInfoPtr pScrn, RADEONSavePtr save)
-{
- RADEONInfoPtr info = RADEONPTR(pScrn);
-
- xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
- "RADEONSaveMode(%p)\n", save);
-
- RADEONSaveMemMapRegisters(pScrn, save);
- RADEONSaveCommonRegisters(pScrn, save);
- RADEONSavePLLRegisters(pScrn, save);
- RADEONSaveCrtcRegisters(pScrn, save);
- RADEONSaveFPRegisters(pScrn, save);
- RADEONSaveDACRegisters(pScrn, save);
- RADEONSaveCrtc2Registers(pScrn, save);
- RADEONSavePLL2Registers(pScrn, save);
- if (info->InternalTVOut)
- RADEONSaveTVRegisters(pScrn, save);
- /*RADEONSavePalette(pScrn, save);*/
-
- xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
- "RADEONSaveMode returns %p\n", save);
-}
-
/* Save everything needed to restore the original VC state */
static void RADEONSave(ScrnInfoPtr pScrn)
{
@@ -5297,7 +5273,17 @@ static void RADEONSave(ScrnInfoPtr pScrn)
save->clock_cntl_index = INREG(RADEON_CLOCK_CNTL_INDEX);
RADEONPllErrataAfterIndex(info);
- RADEONSaveMode(pScrn, save);
+ RADEONSaveMemMapRegisters(pScrn, save);
+ RADEONSaveCommonRegisters(pScrn, save);
+ RADEONSavePLLRegisters(pScrn, save);
+ RADEONSaveCrtcRegisters(pScrn, save);
+ RADEONSaveFPRegisters(pScrn, save);
+ RADEONSaveDACRegisters(pScrn, save);
+ RADEONSaveCrtc2Registers(pScrn, save);
+ RADEONSavePLL2Registers(pScrn, save);
+ if (info->InternalTVOut)
+ RADEONSaveTVRegisters(pScrn, save);
+
RADEONSaveSurfaces(pScrn, save);
}