File xf86-video-intel-crt-mode-fix.diff of Package xorg-x11-driver-video

Overview Repositories Revisions Requests Users Attributes Meta

File xf86-video-intel-crt-mode-fix.diff of Package xorg-x11-driver-video (Revision 0bcb1a1774a492d6a4c12bbf11becdd7)

Currently displaying revision 0bcb1a1774a492d6a4c12bbf11becdd7 , Show latest

diff --git a/src/i830_crt.c b/src/i830_crt.c
index 2e70eb8..e32a11b 100644
--- a/src/i830_crt.c
+++ b/src/i830_crt.c
@@ -425,20 +425,28 @@ static xf86MonPtr
 i830_get_edid(xf86OutputPtr output, int gpio_reg, char *gpio_str)
 {
     I830OutputPrivatePtr    intel_output = output->driver_private;
-    xf86MonPtr		    edid_mon = NULL;
+    xf86MonPtr		    edid_mon;
+    I2CBusPtr		    pbus;
 
     /* Set up the DDC bus. */
-    if (gpio_reg != GPIOA)
-	I830I2CInit(output->scrn, &intel_output->pDDCBus, gpio_reg, gpio_str);
+    pbus = intel_output->pDDCBus;
+    if (pbus->DriverPrivate.uval != gpio_reg)
+	I830I2CInit(output->scrn, &pbus, gpio_reg, gpio_str);
 
-    edid_mon = xf86OutputGetEDID (output, intel_output->pDDCBus);
+    edid_mon = xf86OutputGetEDID (output, pbus);
 
     if (!edid_mon || DIGITAL(edid_mon->features.input_type)) {
-	xf86DestroyI2CBusRec(intel_output->pDDCBus, TRUE, TRUE);
+	if (pbus != intel_output->pDDCBus)
+	    xf86DestroyI2CBusRec(pbus, TRUE, TRUE);
 	if (edid_mon) {
 	    xfree(edid_mon);
 	    edid_mon = NULL;
 	}
+    } else {
+	if (pbus != intel_output->pDDCBus) {
+	    xf86DestroyI2CBusRec(intel_output->pDDCBus, TRUE, TRUE);
+	    intel_output->pDDCBus = pbus;
+	}
     }
     return edid_mon;
 }

Places

File xf86-video-intel-crt-mode-fix.diff of Package xorg-x11-driver-video (Revision 0bcb1a1774a492d6a4c12bbf11becdd7)

Places