Attachment 25945 Details for Bug 20619 – could you try the debug patch on your machine.

[patch] could you try the debug patch on your machine.

crt_hdmi_hotplug.patch (text/plain), 1.76 KB, created by MaLing on 2009-05-17 18:37:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: MaLing

Created: 2009-05-17 18:37:09 UTC

Size: 1.76 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>index 2506592..27986ab 100644
>--- a/drivers/gpu/drm/i915/i915_drv.h
>+++ b/drivers/gpu/drm/i915/i915_drv.h
>@@ -790,7 +790,8 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
> 		       (dev)->pci_device == 0x2E22 || \
> 		       (dev)->pci_device == 0x2E32)
> 
>-#define IS_I965GM(dev) ((dev)->pci_device == 0x2A02)
>+#define IS_I965GM(dev) ((dev)->pci_device == 0x2A02 || \
>+			(dev)->pci_device == 0x2A12) /* I965GME */
> 
> #define IS_GM45(dev) ((dev)->pci_device == 0x2A42)
> 
>diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
>index 9bdd959..19148c3 100644
>--- a/drivers/gpu/drm/i915/intel_crt.c
>+++ b/drivers/gpu/drm/i915/intel_crt.c
>@@ -161,7 +161,7 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector)
> 	hotplug_en &= CRT_FORCE_HOTPLUG_MASK;
> 	hotplug_en |= CRT_HOTPLUG_FORCE_DETECT;
> 
>-	if (IS_GM45(dev))
>+	if (IS_G4X(dev))
> 		hotplug_en |= CRT_HOTPLUG_ACTIVATION_PERIOD_64;
> 
> 	hotplug_en |= CRT_HOTPLUG_VOLTAGE_COMPARE_50;
>diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
>index 5503742..d0983bb 100644
>--- a/drivers/gpu/drm/i915/intel_hdmi.c
>+++ b/drivers/gpu/drm/i915/intel_hdmi.c
>@@ -155,11 +155,18 @@ intel_hdmi_detect(struct drm_connector *connector)
> 
> 	temp = I915_READ(PORT_HOTPLUG_EN);
> 
>-	I915_WRITE(PORT_HOTPLUG_EN,
>-		   temp |
>-		   HDMIB_HOTPLUG_INT_EN |
>-		   HDMIC_HOTPLUG_INT_EN |
>-		   HDMID_HOTPLUG_INT_EN);
>+	switch (hdmi_priv->sdvox_reg) {
>+	case SDVOB:
>+		temp |= HDMIB_HOTPLUG_INT_EN;
>+		break;
>+	case SDVOC:
>+		temp |= HDMIC_HOTPLUG_INT_EN;
>+		break;
>+	default:
>+		return connector_status_unknown;
>+	}
>+
>+	I915_WRITE(PORT_HOTPLUG_EN, temp);
> 
> 	POSTING_READ(PORT_HOTPLUG_EN);
>

Actions: View | Splinter Review

Attachments on bug 20619: 23791 | 23792 | 23793 | 23878 | 24700 | 25945

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.