Attachment 30988 Details for Bug 23183 – Check hotplug status bits

[patch] Check hotplug status bits

i915-hdmi-interrupt-status-fix.patch (text/plain), 1.78 KB, created by Jesse Barnes on 2009-11-05 09:51:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jesse Barnes

Created: 2009-11-05 09:51:33 UTC

Size: 1.78 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
>index 0887581..1a630ab 100644
>--- a/drivers/gpu/drm/i915/i915_irq.c
>+++ b/drivers/gpu/drm/i915/i915_irq.c
>@@ -256,10 +256,15 @@ irqreturn_t igdng_irq_handler(struct drm_device *dev)
> {
> 	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
> 	int ret = IRQ_NONE;
>-	u32 de_iir, gt_iir;
>+	u32 de_iir, gt_iir, de_ier;
> 	u32 new_de_iir, new_gt_iir;
> 	struct drm_i915_master_private *master_priv;
> 
>+	/* disable master interrupt before clearing iir  */
>+	de_ier = I915_READ(DEIER);
>+	I915_WRITE(DEIER, de_ier & ~DE_MASTER_IRQ_CONTROL);
>+	(void)I915_READ(DEIER);
>+
> 	de_iir = I915_READ(DEIIR);
> 	gt_iir = I915_READ(GTIIR);
> 
>@@ -292,6 +297,9 @@ irqreturn_t igdng_irq_handler(struct drm_device *dev)
> 		gt_iir = new_gt_iir;
> 	}
> 
>+	I915_WRITE(DEIER, de_ier);
>+	(void)I915_READ(DEIER);
>+
> 	return ret;
> }
> 
>diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
>index 381cd88..1e0d510 100644
>--- a/drivers/gpu/drm/i915/i915_reg.h
>+++ b/drivers/gpu/drm/i915/i915_reg.h
>@@ -881,12 +881,12 @@
> 
> 
> #define PORT_HOTPLUG_STAT	0x61114
>-#define   HDMIB_HOTPLUG_INT_STATUS		(1 << 29)
>-#define   DPB_HOTPLUG_INT_STATUS		(1 << 29)
>-#define   HDMIC_HOTPLUG_INT_STATUS		(1 << 28)
>-#define   DPC_HOTPLUG_INT_STATUS		(1 << 28)
>-#define   HDMID_HOTPLUG_INT_STATUS		(1 << 27)
>-#define   DPD_HOTPLUG_INT_STATUS		(1 << 27)
>+#define   HDMIB_HOTPLUG_INT_STATUS		(3 << 21)
>+#define   DPB_HOTPLUG_INT_STATUS		(3 << 21)
>+#define   HDMIC_HOTPLUG_INT_STATUS		(3 << 19)
>+#define   DPC_HOTPLUG_INT_STATUS		(3 << 19)
>+#define   HDMID_HOTPLUG_INT_STATUS		(3 << 17)
>+#define   DPD_HOTPLUG_INT_STATUS		(3 << 17)
> #define   CRT_EOS_INT_STATUS			(1 << 12)
> #define   CRT_HOTPLUG_INT_STATUS		(1 << 11)
> #define   TV_HOTPLUG_INT_STATUS			(1 << 10)

Actions: View | Splinter Review

Attachments on bug 23183: 29047 | 29419 | 30988 | 31000 | 31001 | 31133 | 31146 | 31712 | 31761 | 31953

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.