From 7d9e2b450f0fa42553156f57572a6dab70a0ea13 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 12 Sep 2006 07:04:23 +1000 Subject: 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. --- src/radeon_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/radeon_driver.c b/src/radeon_driver.c index fd7854c8..4b79f281 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) && -- cgit v1.2.3