diff options
| -rw-r--r-- | src/radeon_display.c | 19 | ||||
| -rw-r--r-- | src/radeon_driver.c | 4 |
2 files changed, 13 insertions, 10 deletions
diff --git a/src/radeon_display.c b/src/radeon_display.c index e79895f3..e379099b 100644 --- a/src/radeon_display.c +++ b/src/radeon_display.c @@ -1192,6 +1192,7 @@ static RADEONMonitorType RADEONPortCheckNonDDC(ScrnInfoPtr pScrn, xf86OutputPtr /* Secondary Head (mostly VGA, can be DVI on some OEM boards)*/ void RADEONConnectorFindMonitor(ScrnInfoPtr pScrn, xf86OutputPtr output) { + RADEONInfoPtr info = RADEONPTR(pScrn); RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); RADEONOutputPrivatePtr radeon_output = output->driver_private; @@ -1203,6 +1204,15 @@ void RADEONConnectorFindMonitor(ScrnInfoPtr pScrn, xf86OutputPtr output) else radeon_output->MonType = RADEONCrtIsPhysicallyConnected(pScrn, !(radeon_output->DACType)); } + + if (output->MonInfo) { + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "EDID data from the display on connector: %s ----------------------\n", + info->IsAtomBios ? + ConnectorTypeNameATOM[radeon_output->ConnectorType]: + ConnectorTypeName[radeon_output->ConnectorType] + ); + xf86PrintEDID( output->MonInfo ); + } } void RADEONQueryConnectedDisplays(ScrnInfoPtr pScrn) @@ -1312,10 +1322,7 @@ Bool RADEONMapControllers(ScrnInfoPtr pScrn) xf86OutputPtr output; int o; - /* - pRADEONEnt->PortInfo[0]->crtc_num = 1; - pRADEONEnt->PortInfo[1]->crtc_num = 2; - */ + for (o = 0; o < xf86_config->num_output; o++) { output = xf86_config->output[o]; radeon_output = output->driver_private; @@ -2604,7 +2611,7 @@ Bool RADEONAllocateConnectors(ScrnInfoPtr pScrn) } - +#if 0 xf86OutputPtr RADEONGetCrtcConnector(ScrnInfoPtr pScrn, int crtc_num) { RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); @@ -2616,7 +2623,7 @@ xf86OutputPtr RADEONGetCrtcConnector(ScrnInfoPtr pScrn, int crtc_num) } return NULL; } - +#endif /** * In the current world order, there are lists of modes per output, which may diff --git a/src/radeon_driver.c b/src/radeon_driver.c index e16c1831..0624ae6f 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -2543,10 +2543,6 @@ static Bool RADEONPreInitControllers(ScrnInfoPtr pScrn, xf86Int10InfoPtr pInt10 if (!RADEONAllocateConnectors(pScrn)) return FALSE; } - - if (!info->IsSecondary) { - RADEONQueryConnectedDisplays(pScrn); - } RADEONMapControllers(pScrn); |