xf86-video-ati: Branch 'master' - 3 commits

[Alex Deucher]

 src/radeon_driver.c |   56 +++++++++++++++++-----------------------------------
 1 file changed, 19 insertions(+), 37 deletions(-)

New commits:
diff-tree 3a958ba136c3fae5a4ddd56373ac7cd47046f10e (from b6bda79f72df5e5bf9c6b71fa3298e765da506bd)
Author: Alex Deucher <alex at botch2.(none)>
Date:   Wed Oct 3 22:59:14 2007 -0400

    RADEON: remove some cruft

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 831c96b..d434116 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -5317,15 +5317,6 @@ void RADEONRestore(ScrnInfoPtr pScrn)
     OUTREG(RADEON_GRPH_BUFFER_CNTL, restore->grph_buffer_cntl);
     OUTREG(RADEON_GRPH2_BUFFER_CNTL, restore->grph2_buffer_cntl);
 
-#if 0
-    /* M6 card has trouble restoring text mode for its CRT.
-     * This is fixed elsewhere and will be removed in the future.
-     */
-    if ((xf86IsEntityShared(info->pEnt->index) || info->MergedFB)
-	&& info->IsM6)
-	OUTREG(RADEON_DAC_CNTL2, restore->dac2_cntl);
-#endif
-
     RADEONRestoreMemMapRegisters(pScrn, restore);
     RADEONRestoreCommonRegisters(pScrn, restore);
 
diff-tree b6bda79f72df5e5bf9c6b71fa3298e765da506bd (from 5f5c4e6ad61c45c24f1443b91b4bc5375efdebc0)
Author: Alex Deucher <alex at botch2.(none)>
Date:   Wed Oct 3 22:56:27 2007 -0400

    RADEON: more fixes for single crtc chips

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 6668a81..831c96b 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -5243,6 +5243,7 @@ static void RADEONSavePalette(ScrnInfoPt
 static void RADEONSave(ScrnInfoPtr pScrn)
 {
     RADEONInfoPtr  info       = RADEONPTR(pScrn);
+    RADEONEntPtr pRADEONEnt   = RADEONEntPriv(pScrn);
     unsigned char *RADEONMMIO = info->MMIO;
     RADEONSavePtr  save       = &info->SavedReg;
 
@@ -5279,8 +5280,10 @@ static void RADEONSave(ScrnInfoPtr pScrn
     RADEONSaveCrtcRegisters(pScrn, save);
     RADEONSaveFPRegisters(pScrn, save);
     RADEONSaveDACRegisters(pScrn, save);
-    RADEONSaveCrtc2Registers(pScrn, save);
-    RADEONSavePLL2Registers(pScrn, save);
+    if (pRADEONEnt->HasCRTC2) {
+	RADEONSaveCrtc2Registers(pScrn, save);
+	RADEONSavePLL2Registers(pScrn, save);
+    }
     if (info->InternalTVOut)
 	RADEONSaveTVRegisters(pScrn, save);
 
@@ -5369,9 +5372,11 @@ void RADEONRestore(ScrnInfoPtr pScrn)
 #endif
 
     /* need to make sure we don't enable a crtc by accident or we may get a hang */
-    if (info->crtc2_on) {
-	crtc = xf86_config->crtc[1];
-	crtc->funcs->dpms(crtc, DPMSModeOn);
+    if (pRADEONEnt->HasCRTC2) {
+	if (info->crtc2_on) {
+	    crtc = xf86_config->crtc[1];
+	    crtc->funcs->dpms(crtc, DPMSModeOn);
+	}
     }
     if (info->crtc_on) {
 	crtc = xf86_config->crtc[0];
diff-tree 5f5c4e6ad61c45c24f1443b91b4bc5375efdebc0 (from bfede412b3a3cd11769a580b167c528734146096)
Author: Alex Deucher <alex at botch2.(none)>
Date:   Wed Oct 3 22:46:21 2007 -0400

    RADEON: remove RADEONSaveMode()
    
    It's only called by RADEONSave(), so just move its
    contents into RADEONSave().  this mirrors RADEONRestore().

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index b7e2684..6668a81 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -5239,30 +5239,6 @@ static void RADEONSavePalette(ScrnInfoPt
 }
 #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);
 }