Do E-EDID if built against a server that supports it.

This commit is contained in:
Adam Jackson
2008-11-03 15:01:58 -05:00
parent b5f33108fe
commit 52c034f5a4
3 changed files with 16 additions and 2 deletions

View File

@@ -307,7 +307,11 @@ ProbeDDC(I2CBusPtr i2c)
"Probing for EDID on I2C bus %i...\n", bus);
pNv->reg[addr/4] = 7;
/* Should probably use xf86OutputGetEDID here */
#ifdef EDID_COMPLETE_RAWDATA
monInfo = xf86DoEEDID(pScrn->scrnIndex, i2c, TRUE);
#else
monInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, i2c);
#endif
pNv->reg[addr/4] = 3;
if(monInfo) {

View File

@@ -229,7 +229,12 @@ NVProbeDDC (ScrnInfoPtr pScrn, int bus)
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Probing for EDID on I2C bus %s...\n", bus ? "B" : "A");
if ((MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, pNv->I2C))) {
#ifdef EDID_COMPLETE_RAWDATA
MonInfo = xf86DoEEDID(pScrn->scrnIndex, pNv->I2C, TRUE);
#else
MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, pNv->I2C);
#endif
if (MonInfo) {
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
"DDC detected a %s:\n", MonInfo->features.input_type ?
"DFP" : "CRT");

View File

@@ -167,7 +167,12 @@ RivaProbeDDC (ScrnInfoPtr pScrn)
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Probing for EDID...\n");
if ((MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, pRiva->I2C))) {
#ifdef EDID_COMPLETE_RAWDATA
MonInfo = xf86DoEEDID(pScrn->scrnIndex, pNv->I2C, TRUE);
#else
MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, pNv->I2C);
#endif
if (MonInfo) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
" ... found one\n");
xf86PrintEDID( MonInfo );