xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_crtc.c   |    2 +-
 src/radeon_driver.c |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
diff-tree 905b19df33d6f912336b65895e97775ffec07728 (from 7afd04c1e4ffa6e4e5ba08ae90ba002237dc282b)
Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
Date:   Thu Oct 11 18:55:08 2007 -0400

    RADEON: small cleanup from last commit

diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c
index ca554d2..4637763 100644
--- a/src/radeon_crtc.c
+++ b/src/radeon_crtc.c
@@ -311,7 +311,7 @@ RADEONInitCrtcRegisters(xf86CrtcPtr crtc
 	return FALSE;
     }
 
-    save->bios_4_scratch = info->SavedReg.bios_4_scratch;
+    /*save->bios_4_scratch = info->SavedReg.bios_4_scratch;*/
     save->crtc_gen_cntl = (RADEON_CRTC_EXT_DISP_EN
 			   | RADEON_CRTC_EN
 			   | (format << 8)
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 10223f4..40e1d98 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -4251,6 +4251,8 @@ void RADEONRestoreBIOSRegisters(ScrnInfo
     OUTREG(RADEON_BIOS_5_SCRATCH, restore->bios_5_scratch);
     if (restore->bios_6_scratch & 0x40000000)
 	bios_6_scratch |= 0x40000000;
+    else
+	bios_6_scratch &= ~0x40000000;
     OUTREG(RADEON_BIOS_6_SCRATCH, bios_6_scratch);
 
 }