]> git.karo-electronics.de Git - linux-beck.git/commitdiff
drm/i915: Don't touch PORT_HOTPLUG_EN in intel_dp_detect()
authorKarsten Wiese <fzuuzf@googlemail.com>
Sat, 27 Mar 2010 21:48:33 +0000 (22:48 +0100)
committerEric Anholt <eric@anholt.net>
Mon, 19 Apr 2010 00:11:44 +0000 (17:11 -0700)
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>
drivers/gpu/drm/i915/intel_dp.c

index 480a5eef8a48e78becea94f90ce0fae9eba49aab..21e3fdc0758532317f20883960e3b474d30b5c29 100644 (file)
@@ -1232,16 +1232,6 @@ intel_dp_detect(struct drm_connector *connector)
        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;