Home » Mailing list archives » linux-kernel » 2010 » July » 1

[199/200] drm/i915: Dont touch PORT_HOTPLUG_EN in intel_dp_detect()

Previous thread: [200/200] parisc: clear floating point exception flag on SIGFPE signal by Greg KH on Thursday, July 1, 2010 - 10:44 am. (1 message)

Next thread: [069/200] can: Fix SJA1000 command register writes on SMP systems by Greg KH on Thursday, July 1, 2010 - 10:42 am. (1 message)
[view original message]
From: Greg KH
Subject: [199/200] drm/i915: Dont touch PORT_HOTPLUG_EN in intel_dp_detect()
Date: Thursday, July 1, 2010 - 10:44 am

2.6.34-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Karsten Wiese <fzuuzf@googlemail.com>

commit 6e0032f0ae4440e75256bee11b163552cae21962 upstream.

PORT_HOTPLUG_EN has allready been setup in i915_driver_irq_postinstall(),
when intel_dp_detect() runs.

Delete the DP[BCD]_HOTPLUG_INT_EN defines, they are not referenced anymore.

I found this while searching for a fix for
        https://bugzilla.redhat.com/show_bug.cgi?id=528312

Signed-off-by: Karsten Wiese <fzu@wemgehoertderstaat.de>
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 drivers/gpu/drm/i915/intel_dp.c |   10 ----------
 1 file changed, 10 deletions(-)

--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1180,16 +1180,6 @@ intel_dp_detect(struct drm_connector *co
 	if (HAS_PCH_SPLIT(dev))
 		return ironlake_dp_detect(connector);
 
-	temp = I915_READ(PORT_HOTPLUG_EN);
-
-	I915_WRITE(PORT_HOTPLUG_EN,
-	       temp |
-	       DPB_HOTPLUG_INT_EN |
-	       DPC_HOTPLUG_INT_EN |
-	       DPD_HOTPLUG_INT_EN);
-
-	POSTING_READ(PORT_HOTPLUG_EN);
-
 	switch (dp_priv->output_reg) {
 	case DP_B:
 		bit = DPB_HOTPLUG_INT_STATUS;


--


[ message continues ]
Previous thread: [200/200] parisc: clear floating point exception flag on SIGFPE signal by Greg KH on Thursday, July 1, 2010 - 10:44 am. (1 message)

Next thread: [069/200] can: Fix SJA1000 command register writes on SMP systems by Greg KH on Thursday, July 1, 2010 - 10:42 am. (1 message)