aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKarsten Wiese <fzuuzf@googlemail.com>2010-03-27 17:48:33 -0400
committerEric Anholt <eric@anholt.net>2010-04-18 20:11:44 -0400
commit6e0032f0ae4440e75256bee11b163552cae21962 (patch)
tree206a783bf8983977a82208f04addea4cae5e63de /drivers
parent77ffb5979de59efd1a6b280b10d647b09285bee0 (diff)
drm/i915: Don't touch PORT_HOTPLUG_EN in intel_dp_detect()
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/intel_dp.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 480a5eef8a48..21e3fdc07585 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1232,16 +1232,6 @@ intel_dp_detect(struct drm_connector *connector)
1232 if (HAS_PCH_SPLIT(dev)) 1232 if (HAS_PCH_SPLIT(dev))
1233 return ironlake_dp_detect(connector); 1233 return ironlake_dp_detect(connector);
1234 1234
1235 temp = I915_READ(PORT_HOTPLUG_EN);
1236
1237 I915_WRITE(PORT_HOTPLUG_EN,
1238 temp |
1239 DPB_HOTPLUG_INT_EN |
1240 DPC_HOTPLUG_INT_EN |
1241 DPD_HOTPLUG_INT_EN);
1242
1243 POSTING_READ(PORT_HOTPLUG_EN);
1244
1245 switch (dp_priv->output_reg) { 1235 switch (dp_priv->output_reg) {
1246 case DP_B: 1236 case DP_B:
1247 bit = DPB_HOTPLUG_INT_STATUS; 1237 bit = DPB_HOTPLUG_INT_STATUS;