summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2008-03-31 14:29:44 +1000
committerDave Airlie <airlied@redhat.com>2008-03-31 14:29:44 +1000
commit959509dd54de053f526b534e379a46934127231f (patch)
tree4727742cf7907a7e6db52bb67bd5934dd3e45ae1
parent18f5f1cd2f52afed89fc11ade0920f3dfea87306 (diff)
radeon: use correct DDC interfaces so quirks get applied
Radeon seemed to mess up applying certain quirks, hopefully this will fix it.
-rw-r--r--src/radeon_output.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/radeon_output.c b/src/radeon_output.c
index 5ad0ac48..28539d48 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -297,7 +297,7 @@ RADEONDisplayDDCConnected(ScrnInfoPtr pScrn, xf86OutputPtr output)
INREG(DDCReg) & ~(RADEON_GPIO_EN_0));
usleep(15000);
- MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, radeon_output->pI2CBus);
+ MonInfo = xf86OutputGetEDID(output, radeon_output->pI2CBus);
OUTREG(DDCReg, INREG(DDCReg) | RADEON_GPIO_EN_1);
OUTREG(DDCReg, INREG(DDCReg) | RADEON_GPIO_EN_0);
@@ -320,7 +320,7 @@ RADEONDisplayDDCConnected(ScrnInfoPtr pScrn, xf86OutputPtr output)
if (MonInfo) break;
}
} else if (radeon_output->pI2CBus && info->ddc2 && ((DDCReg == RADEON_LCD_GPIO_MASK) || (DDCReg == RADEON_MDGPIO_EN_REG))) {
- MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex, radeon_output->pI2CBus);
+ MonInfo = xf86OutputGetEDID(output, radeon_output->pI2CBus);
} else {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "DDC2/I2C is not properly initialized\n");
MonType = MT_NONE;