Attachment 19511 Details for Bug 17892 – right take2 patch

[patch] right take2 patch

i830-crt-probe-take-2.patch (text/plain), 2.88 KB, created by Wang Zhenyu on 2008-10-08 22:48:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wang Zhenyu

Created: 2008-10-08 22:48:45 UTC

Size: 2.88 KB

patch

obsolete

>diff --git a/src/i830_crt.c b/src/i830_crt.c
>index 2e70eb8..479fbe5 100644
>--- a/src/i830_crt.c
>+++ b/src/i830_crt.c
>@@ -338,13 +338,19 @@ i830_crt_detect_load (xf86CrtcPtr	    crtc,
> static Bool
> i830_crt_detect_ddc(xf86OutputPtr output)
> {
>+    ScrnInfoPtr		    pScrn = output->scrn;
>     I830OutputPrivatePtr    i830_output = output->driver_private;
>+    Bool detect;
> 
>     /* CRT should always be at 0, but check anyway */
>     if (i830_output->type != I830_OUTPUT_ANALOG)
> 	return FALSE;
> 
>-    return xf86I2CProbeAddress(i830_output->pDDCBus, 0x00A0);
>+    I830I2CInit(pScrn, &i830_output->pDDCBus, GPIOA, "CRTDDC_A");
>+    detect = xf86I2CProbeAddress(i830_output->pDDCBus, 0x00A0);
>+    xf86DestroyI2CBusRec(i830_output->pDDCBus, TRUE, TRUE);
>+
>+    return detect;
> }
> 
> /**
>@@ -428,18 +434,19 @@ i830_get_edid(xf86OutputPtr output, int gpio_reg, char *gpio_str)
>     xf86MonPtr		    edid_mon = NULL;
> 
>     /* Set up the DDC bus. */
>-    if (gpio_reg != GPIOA)
>-	I830I2CInit(output->scrn, &intel_output->pDDCBus, gpio_reg, gpio_str);
>+    I830I2CInit(output->scrn, &intel_output->pDDCBus, gpio_reg, gpio_str);
> 
>     edid_mon = xf86OutputGetEDID (output, intel_output->pDDCBus);
> 
>     if (!edid_mon || DIGITAL(edid_mon->features.input_type)) {
> 	xf86DestroyI2CBusRec(intel_output->pDDCBus, TRUE, TRUE);
>+	intel_output->pDDCBus = NULL;
> 	if (edid_mon) {
> 	    xfree(edid_mon);
> 	    edid_mon = NULL;
> 	}
>     }
>+
>     return edid_mon;
> }
> 
>@@ -448,6 +455,7 @@ i830_crt_get_modes (xf86OutputPtr output)
> {
>     DisplayModePtr	    modes;
>     xf86MonPtr		    edid_mon = NULL;
>+    I830OutputPrivatePtr    intel_output = output->driver_private;
> 
>     /* Try to probe normal CRT port, and also digital port for output
>        in DVI-I mode. */
>@@ -458,6 +466,11 @@ i830_crt_get_modes (xf86OutputPtr output)
>     if ((edid_mon = i830_get_edid(output, GPIOE, "CRTDDC_E")))
> 	goto found;
> found:
>+    /* Destroy DDC bus after probe, so every other new probe will
>+       scan all ports again */
>+    if (intel_output->pDDCBus)
>+	xf86DestroyI2CBusRec(intel_output->pDDCBus, TRUE, TRUE);
>+
>     xf86OutputSetEDID (output, edid_mon);
> 
>     modes = xf86OutputGetEDIDModes (output);
>@@ -509,7 +522,4 @@ i830_crt_init(ScrnInfoPtr pScrn)
>     output->driver_private = i830_output;
>     output->interlaceAllowed = FALSE;
>     output->doubleScanAllowed = FALSE;
>-
>-    /* Set up the DDC bus. */
>-    I830I2CInit(pScrn, &i830_output->pDDCBus, GPIOA, "CRTDDC_A");
> }
>diff --git a/src/i830_quirks.c b/src/i830_quirks.c
>index 528b564..12cab86 100644
>--- a/src/i830_quirks.c
>+++ b/src/i830_quirks.c
>@@ -258,8 +258,6 @@ static i830_quirk i830_quirk_list[] = {
> 
>     /* Lenovo Napa TV (use dmi)*/
>     { PCI_CHIP_I945_GM, 0x17aa, SUBSYS_ANY, quirk_lenovo_tv_dmi },
>-    /* Lenovo T61 has no TV output */
>-    { PCI_CHIP_I965_GM, 0x17aa, 0x20b5, quirk_ignore_tv },
>     /* Lenovo 3000 v200 */
>     { PCI_CHIP_I965_GM, 0x17aa, 0x3c18, quirk_ignore_tv },
>

Actions: View | Splinter Review

Attachments on bug 17892: 19354 | 19389 | 19419 | 19502 | 19507 | 19508 | 19510 | 19511

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.