xf86-video-ati: Branch '6.12-branch'
Alex Deucher
agd5f at kemper.freedesktop.org
Thu May 14 12:53:58 PDT 2009
src/radeon_bios.c | 10 ++++++++++
1 file changed, 10 insertions(+)
New commits:
commit a5a0c4626a982a1823146eab82efc94ea7853b62
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 9b5cb88..2bacc40 100644
--- a/src/radeon_bios.c
+++ b/src/radeon_bios.c
@@ -273,6 +273,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)
@@ -283,6 +284,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;
}
More information about the xorg-commit
mailing list