diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-11-03 15:01:58 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-11-03 15:01:58 -0500 |
| commit | 52c034f5a41195f2b3193ec8c18b3f4ed7a763a3 (patch) | |
| tree | 3db61f7b1428618f559bec9b4819139b75ba3128 /src | |
| parent | b5f33108fea77280c9acd219954f20401f760faf (diff) | |
Do E-EDID if built against a server that supports it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/g80_output.c | 4 | ||||
| -rw-r--r-- | src/nv_setup.c | 7 | ||||
| -rw-r--r-- | src/riva_setup.c | 7 |
3 files changed, 16 insertions, 2 deletions
diff --git a/src/g80_output.c b/src/g80_output.c index e906fbb..420a73e 100644 --- a/src/g80_output.c +++ b/src/g80_output.c @@ -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) { diff --git a/src/nv_setup.c b/src/nv_setup.c index bea0050..132a96b 100644 --- a/src/nv_setup.c +++ b/src/nv_setup.c @@ -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"); diff --git a/src/riva_setup.c b/src/riva_setup.c index b7352b6..b616798 100644 --- a/src/riva_setup.c +++ b/src/riva_setup.c @@ -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 ); |