summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Airlie <airlied@asimov.stargames.com.au>2006-11-13 09:35:18 +1100
committerDave Airlie <airlied@linux.ie>2006-11-13 20:25:32 +1100
commit13e0a95564220d42ad8060b43b0aaaba3002157a (patch)
tree66996ace8695db51d36c8fff2192918378e6dd62
parent63444770ff30afeb134befed5bb3a5c28b7bc4e9 (diff)
fix up issue with bindings and mergedfb
-rw-r--r--src/radeon_display.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/radeon_display.c b/src/radeon_display.c
index d4264f60..6aa87d47 100644
--- a/src/radeon_display.c
+++ b/src/radeon_display.c
@@ -1351,14 +1351,15 @@ Bool RADEONMapControllers(ScrnInfoPtr pScrn)
info->DisplayType = pRADEONEnt->Controller[1].pPort->MonType;
pScrn->monitor->DDC = pRADEONEnt->Controller[1].pPort->MonInfo;
} else {
- pRADEONEnt->Controller[1].binding = 1;
+ pRADEONEnt->Controller[0].binding = 1;
info->DisplayType = pRADEONEnt->Controller[0].pPort->MonType;
pScrn->monitor->DDC = pRADEONEnt->Controller[0].pPort->MonInfo;
}
if(!pRADEONEnt->HasSecondary) {
- pRADEONEnt->Controller[1].binding = 1;
info->MergeType = pRADEONEnt->Controller[1].pPort->MonType;
+ if (info->MergeType)
+ pRADEONEnt->Controller[1].binding = 1;
}
} else {
if (pRADEONEnt->Controller[0].pPort->MonType == MT_NONE)