summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@starflyer-ubuntu.(none)>2006-09-12 07:04:23 +1000
committerDave Airlie <airlied@starflyer-ubuntu.(none)>2006-09-12 07:05:51 +1000
commit7d9e2b450f0fa42553156f57572a6dab70a0ea13 (patch)
tree85ce368639cbc41a81925a82e3cbaf77638e4f9a
parentad1778eb1eb59de14ec309b99131931cbccf64e9 (diff)
radeon: this stops mergedfb working on my ATI M7 development board
I've no idea what this is for, it came from an ATI codedrop and it may fix some laptop or production system, but it looks to me more like a dirty hack than a true fix, as I have an M7 which I need to specify CRT for the second head and it breaks mergedfb for me.
-rw-r--r--src/radeon_driver.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index fd7854c..4b79f28 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -1973,7 +1973,7 @@ static BOOL RADEONQueryConnectedMonitors(ScrnInfoPtr pScrn)
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
"MonitorLayout Option: \n\tMonitor1--Type %s, Monitor2--Type %s\n\n", s1, s2);
-
+#if 0
if (pRADEONEnt->PortInfo[1].MonType == MT_CRT) {
pRADEONEnt->PortInfo[1].DACType = DAC_PRIMARY;
pRADEONEnt->PortInfo[1].TMDSType = TMDS_UNKNOWN;
@@ -1985,6 +1985,7 @@ static BOOL RADEONQueryConnectedMonitors(ScrnInfoPtr pScrn)
pRADEONEnt->PortInfo[0].ConnectorType = pRADEONEnt->PortInfo[0].MonType+1;
pRADEONEnt->PortInfo[0].MonInfo = NULL;
}
+#endif
if (!ignore_edid) {
if ((pRADEONEnt->PortInfo[0].MonType > MT_NONE) &&