xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_driver.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

New commits:
commit a0a73208a21546ac120fb9a463261836c9ea7b55
Author: Alex Deucher <alex at botch2.(none)>
Date:   Tue Feb 19 20:11:19 2008 -0500

    RADEON: restore clock gating and CP clock errata on VT switch
    
    This may help people with hangs on resume

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 9c5fce6..abf7d5c 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -4906,6 +4906,17 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
     /* Makes sure the engine is idle before doing anything */
     RADEONWaitForIdleMMIO(pScrn);
 
+    if (info->IsMobility && !IS_AVIVO_VARIANT) {
+        if (xf86ReturnOptValBool(info->Options, OPTION_DYNAMIC_CLOCKS, FALSE)) {
+	    RADEONSetDynamicClock(pScrn, 1);
+        } else {
+	    RADEONSetDynamicClock(pScrn, 0);
+        }
+    }
+
+    if (IS_R300_VARIANT || IS_RV100_VARIANT)
+	RADEONForceSomeClocks(pScrn);
+
     pScrn->vtSema = TRUE;
     for (i = 0; i < xf86_config->num_crtc; i++) {
 	xf86CrtcPtr	crtc = xf86_config->crtc[i];