summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2005-04-04 23:07:08 +0000
committerDaniel Stone <daniel@fooishbar.org>2005-04-04 23:07:08 +0000
commit310eb24a45b145efbd47196a1c3ec750cf004154 (patch)
tree25db5abaa7984207212725fa80b43012b9f85a7f
parenta416667f980a8679352be897af2fb3215da2d000 (diff)
Release SDA/SDL I2C lines from an asserted-low state after a DDC probe,XORG-6_8_99_3XORG-6_8_99_2
which caused Apple Studio Display monitors to shut off after a second or so (Ben Herrenschmidt).
-rw-r--r--src/radeon_driver.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index f803b33f..3265aa83 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -1006,6 +1006,9 @@ static RADEONMonitorType RADEONDisplayDDCConnected(ScrnInfoPtr pScrn, RADEONDDCT
MonType = MT_NONE;
}
+ OUTREG(info->DDCReg, INREG(info->DDCReg) &
+ ~(RADEON_GPIO_EN_0 | RADEON_GPIO_EN_1));
+
if (*MonInfo) {
if ((*MonInfo)->rawData[0x14] & 0x80) {
/* Note some laptops have a DVI output that uses internal TMDS,