summaryrefslogtreecommitdiff
path: root/src/radeon_bios.c
diff options
context:
space:
mode:
authorAlex Deucher <alex@botch2.(none)>2007-11-19 00:02:14 -0500
committerAlex Deucher <alex@botch2.(none)>2007-11-19 00:02:14 -0500
commit3f1fc7eef13ea02fa5119e9b51d499841b801f2d (patch)
treecd1926069afaed5384ea21a57eb940bcece469c5 /src/radeon_bios.c
parent8f84c5ad4c4af14612ea68fe6f24d0d527f00acc (diff)
CRTs/DFPs may share a DVI port, but TV and CV don't
Diffstat (limited to 'src/radeon_bios.c')
-rw-r--r--src/radeon_bios.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/radeon_bios.c b/src/radeon_bios.c
index 8b6b075b..4dada7cb 100644
--- a/src/radeon_bios.c
+++ b/src/radeon_bios.c
@@ -248,15 +248,18 @@ static Bool RADEONGetATOMConnectorInfoFromBIOS (ScrnInfoPtr pScrn)
return FALSE;
}
+ /* CRTs/DFPs may share a port */
for (i = 0; i < RADEON_MAX_BIOS_CONNECTOR; i++) {
if (info->BiosConnector[i].valid) {
for (j = 0; j < RADEON_MAX_BIOS_CONNECTOR; j++) {
if (info->BiosConnector[j].valid && (i != j) ) {
if (info->BiosConnector[i].output_id == info->BiosConnector[j].output_id) {
- if ((i == 3) || (i == 7) || (i == 9)) {
+ if (((i == 3) || (i == 7) || (i == 9)) &&
+ ((j == 0) || (j == 4))) {
info->BiosConnector[i].DACType = info->BiosConnector[j].DACType;
info->BiosConnector[j].valid = FALSE;
- } else if ((j == 3) || (j == 7) || (j == 9)) {
+ } else if (((j == 3) || (j == 7) || (j == 9)) &&
+ ((i == 0) || (i == 4))) {
info->BiosConnector[j].DACType = info->BiosConnector[i].DACType;
info->BiosConnector[i].valid = FALSE;
}