xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_bios.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 714b2c63ec1c4a1410a6d521c03e9d1f90937c01
Author: Alex Deucher <alex at botch2.com>
Date:   Thu May 29 02:31:00 2008 -0400

    RADEON: don't enable legacy bios table based init yet
    
    Needs more work and we need to figure out how best to decide
    when to use it.

diff --git a/src/radeon_bios.c b/src/radeon_bios.c
index fa8305c..529dda7 100644
--- a/src/radeon_bios.c
+++ b/src/radeon_bios.c
@@ -378,7 +378,9 @@ RADEONGetBIOSInfo(ScrnInfoPtr pScrn, xf86Int10InfoPtr  pInt10)
                         GET_REF_CLOCK, &atomBiosArg);
 
 	info->MasterDataStart = RADEON_BIOS16 (info->ROMHeaderStart + 32);
-    } else {
+    }
+#if 0
+    else {
 	/* non-primary card may need posting */
 	if (!pInt10) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Attempting to POST via BIOS tables\n");
@@ -386,7 +388,7 @@ RADEONGetBIOSInfo(ScrnInfoPtr pScrn, xf86Int10InfoPtr  pInt10)
 	    RADEONPostCardFromBIOSTables(pScrn);
 	}
     }
-
+#endif
     return TRUE;
 }