summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2008-10-16 10:24:04 +0800
committerZhenyu Wang <zhenyu.z.wang@intel.com>2008-10-16 10:24:04 +0800
commit986c8df79e83c369655ad786a6bf6342b53c535d (patch)
tree45414f97d4c87ca716a8bb14b87ebc5aa80f3a5c
parent6707371176147340fabc9ab6f1e3d6d5ac980662 (diff)
downloadxf86-video-intel-frc-986c8df79e83c369655ad786a6bf6342b53c535d.tar.gz
xf86-video-intel-frc-986c8df79e83c369655ad786a6bf6342b53c535d.tar.bz2
Fix Mac mini crash in DDC mode probe
SDVO on Mac mini trys to get EDID from CRT port, which failed with recent DVI-I change.
-rw-r--r--src/i830_sdvo.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/i830_sdvo.c b/src/i830_sdvo.c
index 8f1b20b7..35fccd58 100644
--- a/src/i830_sdvo.c
+++ b/src/i830_sdvo.c
@@ -1495,7 +1495,9 @@ i830_sdvo_get_ddc_modes(xf86OutputPtr output)
intel_output = crt->driver_private;
if (intel_output->type == I830_OUTPUT_ANALOG &&
crt->funcs->detect(crt) == XF86OutputStatusDisconnected) {
+ I830I2CInit(pScrn, &intel_output->pDDCBus, GPIOA, "CRTDDC_A");
edid_mon = xf86OutputGetEDID(crt, intel_output->pDDCBus);
+ xf86DestroyI2CBusRec(intel_output->pDDCBus, TRUE, TRUE);
}
if (edid_mon) {
xf86OutputSetEDID(output, edid_mon);