Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e0032f0 authored by Karsten Wiese's avatar Karsten Wiese Committed by Eric Anholt
Browse files

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: default avatarKarsten Wiese <fzu@wemgehoertderstaat.de>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent 77ffb597

drivers/gpu/drm/i915/intel_dp.c

+0 −10
Original line number Diff line number Diff line
@@ -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;