xf86-video-ati: Branch 'master' - 3 commits
Alex Deucher
agd5f at kemper.freedesktop.org
Wed Dec 19 08:59:16 PST 2007
src/radeon_bios.c | 16 +++++++++++++++-
src/radeon_output.c | 4 ++++
2 files changed, 19 insertions(+), 1 deletion(-)
New commits:
commit c1b0b69cc50516c3b7e881b0eb46cb3cd2e9dce6
Merge: 0e66348... ce4fa1c...
Author: Alex Deucher <alex at botch2.(none)>
Date: Wed Dec 19 11:54:50 2007 -0500
Merge branch 'master' of ssh://agd5f@git.freedesktop.org/git/xorg/driver/xf86-video-ati
commit 0e6634870d1ab38ee8c83f6bda1ba60364997853
Author: Alex Deucher <alex at botch2.(none)>
Date: Wed Dec 19 11:54:27 2007 -0500
RADEON: skip empty connectors when creating outputs
diff --git a/src/radeon_output.c b/src/radeon_output.c
index c60ece8..115666d 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -3217,6 +3217,10 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn)
for (i = 0 ; i < RADEON_MAX_BIOS_CONNECTOR; i++) {
if (info->BiosConnector[i].valid) {
+
+ if (info->BiosConnector[i].ConnectorType == CONNECTOR_NONE)
+ continue;
+
RADEONOutputPrivatePtr radeon_output = xnfcalloc(sizeof(RADEONOutputPrivateRec), 1);
if (!radeon_output) {
return FALSE;
commit 6afbf718c151dc3c5c59bd3136b58a93a114d798
Author: Alex Deucher <alex at botch2.(none)>
Date: Wed Dec 19 11:48:38 2007 -0500
RADEON: add support for legacy radeons with DVI and no connector table
diff --git a/src/radeon_bios.c b/src/radeon_bios.c
index d150c4b..7d4d12a 100644
--- a/src/radeon_bios.c
+++ b/src/radeon_bios.c
@@ -277,7 +277,21 @@ static Bool RADEONGetLegacyConnectorInfoFromBIOS (ScrnInfoPtr pScrn)
}
} else {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "No Connector Info Table found!\n");
- return FALSE;
+
+ /* old radeons and r128 didn't use connector tables you just check
+ * for LVDS, DVI, TV, etc. tables
+ */
+ offset = RADEON_BIOS16(info->ROMHeaderStart + 0x34);
+ if (offset) {
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Found DFP table, assuming DVI connector\n");
+ info->BiosConnector[0].valid = TRUE;
+ info->BiosConnector[0].ConnectorType = CONNECTOR_DVI_I;
+ info->BiosConnector[0].DACType = DAC_PRIMARY;
+ info->BiosConnector[0].TMDSType = TMDS_INT;
+ info->BiosConnector[0].DDCType = DDC_DVI;
+ } else
+ return FALSE;
}
/* check LVDS table */
More information about the xorg-commit
mailing list