Attachment 39278 Details for Bug 30378 – The patch to fix this issue

[patch] The patch to fix this issue

0001-drm-i915-make-sure-hotpulg-is-enabled.patch (text/plain), 2.97 KB, created by Yuanhan Liu on 2010-10-07 20:51:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuanhan Liu

Created: 2010-10-07 20:51:41 UTC

Size: 2.97 KB

patch

obsolete

>From 901ded64369e87c61344ebbeb3dd0cf8a215da2c Mon Sep 17 00:00:00 2001
>From: Yuanhan Liu <yuanhan.liu@intel.com>
>Date: Fri, 8 Oct 2010 11:33:47 +0800
>Subject: [PATCH] drm/i915: make sure hotpulg is enabled
>
>Make sure hotplugh is enabled, or the hotplug interrupt will not be
>invoked.
>
>And, for sandybridge, the bit definition for hotplug on SDE is changed.
>
>Signed-off-by: Yuanhan Liu <yuanhan.liu@intel.com>
>---
> drivers/gpu/drm/i915/i915_irq.c  |   11 +++++++++--
> drivers/gpu/drm/i915/i915_reg.h  |    2 +-
> drivers/gpu/drm/i915/intel_crt.c |    3 ++-
> 3 files changed, 12 insertions(+), 4 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
>index 744225e..126001f 100644
>--- a/drivers/gpu/drm/i915/i915_irq.c
>+++ b/drivers/gpu/drm/i915/i915_irq.c
>@@ -1424,8 +1424,7 @@ static int ironlake_irq_postinstall(struct drm_device *dev)
> 	u32 display_mask = DE_MASTER_IRQ_CONTROL | DE_GSE | DE_PCH_EVENT |
> 			   DE_PLANEA_FLIP_DONE | DE_PLANEB_FLIP_DONE;
> 	u32 render_mask = GT_PIPE_NOTIFY | GT_BSD_USER_INTERRUPT;
>-	u32 hotplug_mask = SDE_CRT_HOTPLUG | SDE_PORTB_HOTPLUG |
>-			   SDE_PORTC_HOTPLUG | SDE_PORTD_HOTPLUG;
>+	u32 hotplug_mask;
> 
> 	dev_priv->irq_mask_reg = ~display_mask;
> 	dev_priv->de_irq_enable_reg = display_mask | DE_PIPEA_VBLANK | DE_PIPEB_VBLANK;
>@@ -1450,6 +1449,14 @@ static int ironlake_irq_postinstall(struct drm_device *dev)
> 	I915_WRITE(GTIER, dev_priv->gt_irq_enable_reg);
> 	(void) I915_READ(GTIER);
> 
>+	if (IS_GEN6(dev)) {
>+		hotplug_mask = SDE_CRT_HOTPLUG_CPT | SDE_PORTB_HOTPLUG_CPT  |
>+			       SDE_PORTC_HOTPLUG_CPT | SDE_PORTD_HOTPLUG_CPT ;
>+	} else {
>+		hotplug_mask = SDE_CRT_HOTPLUG | SDE_PORTB_HOTPLUG |
>+			       SDE_PORTC_HOTPLUG | SDE_PORTD_HOTPLUG;
>+	}
>+
> 	dev_priv->pch_irq_mask_reg = ~hotplug_mask;
> 	dev_priv->pch_irq_enable_reg = hotplug_mask;
> 
>diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
>index 4f5e155..31463ea 100644
>--- a/drivers/gpu/drm/i915/i915_reg.h
>+++ b/drivers/gpu/drm/i915/i915_reg.h
>@@ -2545,12 +2545,12 @@
> #define SDE_PORTC_HOTPLUG       (1 << 9)
> #define SDE_PORTB_HOTPLUG       (1 << 8)
> #define SDE_SDVOB_HOTPLUG       (1 << 6)
>-#define SDE_HOTPLUG_MASK	(0xf << 8)
> /* CPT */
> #define SDE_CRT_HOTPLUG_CPT	(1 << 19)
> #define SDE_PORTD_HOTPLUG_CPT	(1 << 23)
> #define SDE_PORTC_HOTPLUG_CPT	(1 << 22)
> #define SDE_PORTB_HOTPLUG_CPT	(1 << 21)
>+#define SDE_HOTPLUG_MASK	(0xf << 8 | SDE_CRT_HOTPLUG_CPT | 0x7 << 21)
> 
> #define SDEISR  0xc4000
> #define SDEIMR  0xc4004
>diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
>index 4b77351..50cb18a 100644
>--- a/drivers/gpu/drm/i915/intel_crt.c
>+++ b/drivers/gpu/drm/i915/intel_crt.c
>@@ -191,7 +191,8 @@ static bool intel_ironlake_crt_detect_hotplug(struct drm_connector *connector)
> 		DRM_ERROR("timed out waiting for FORCE_TRIGGER");
> 
> 	if (turn_off_dac) {
>-		I915_WRITE(PCH_ADPA, temp);
>+		/* Make sure hotplug is enabled */
>+		I915_WRITE(PCH_ADPA, temp | ADPA_CRT_HOTPLUG_ENABLE);
> 		(void)I915_READ(PCH_ADPA);
> 	}
> 
>-- 
>1.7.0.1
>

Actions: View | Splinter Review

Attachments on bug 30378: 38999 | 39278

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.