xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_bios.c |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 1a1eef31e36f98b7a30e27e567c1b66e0e4cf7dc
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu May 14 15:48:54 2009 -0400

    radeon: try harder when checking if a card is posted
    
    fixes debian bug 524280, possibly others.

diff --git a/src/radeon_bios.c b/src/radeon_bios.c
index 9907e09..ecf5403 100644
--- a/src/radeon_bios.c
+++ b/src/radeon_bios.c
@@ -328,6 +328,7 @@ radeon_card_posted(ScrnInfoPtr pScrn)
     unsigned char *RADEONMMIO = info->MMIO;
     uint32_t reg;
 
+    /* first check CRTCs */
     if (IS_AVIVO_VARIANT) {
 	reg = INREG(AVIVO_D1CRTC_CONTROL) | INREG(AVIVO_D2CRTC_CONTROL);
 	if (reg & AVIVO_CRTC_EN)
@@ -338,6 +339,15 @@ radeon_card_posted(ScrnInfoPtr pScrn)
 	    return TRUE;
     }
 
+    /* then check MEM_SIZE, in case something turned the crtcs off */
+    if (info->ChipFamily >= CHIP_FAMILY_R600)
+	reg = INREG(R600_CONFIG_MEMSIZE);
+    else
+	reg = INREG(RADEON_CONFIG_MEMSIZE);
+
+    if (reg)
+	return TRUE;
+
     return FALSE;
 }