xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_driver.c |    1 +
 1 files changed, 1 insertion(+)

New commits:
diff-tree 2632ae24b3b50c69567e92611ce7c2cd2ee98baa (from ddec94e8f2f5746bad0e998d15303e771803d22b)
Author: Dave Airlie <airlied at linux.ie>
Date:   Sun Dec 3 15:22:38 2006 +1100

    re-program bios 4 scratch so we know if the LCD panel is there post startup

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index dc59d26..0ba4427 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -5866,6 +5866,7 @@ static Bool RADEONInitCrtcRegisters(Scrn
 	return FALSE;
     }
 
+    save->bios_4_scratch = info->SavedReg.bios_4_scratch;
     save->crtc_gen_cntl = (RADEON_CRTC_EXT_DISP_EN
 			   | RADEON_CRTC_EN
 			   | (format << 8)