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

Commit d2182a66 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Don't register HDMI connectors for eDP ports on VLV/CHV 



If we determine that a specific port is eDP, don't register the HDMI
connector/encoder for it. The reason being that we want to disable
HPD interrupts for eDP ports when the display is off, but the presence
of the extra HDMI connector would demand the HPD interrupt to remain
enabled all the time.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 778eb334

drivers/gpu/drm/i915/intel_display.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -12393,14 +12393,16 @@ static void intel_setup_outputs(struct drm_device *dev) 
		 * eDP ports. Consult the VBT as well as DP_DETECTED to

		 * eDP ports. Consult the VBT as well as DP_DETECTED to

		 * detect eDP ports.

		 * detect eDP ports.

		 */

		 */

		if (I915_READ(VLV_DISPLAY_BASE + GEN4_HDMIB) & SDVO_DETECTED)

		if (I915_READ(VLV_DISPLAY_BASE + GEN4_HDMIB) & SDVO_DETECTED &&

		    !intel_dp_is_edp(dev, PORT_B))

			intel_hdmi_init(dev, VLV_DISPLAY_BASE + GEN4_HDMIB,

			intel_hdmi_init(dev, VLV_DISPLAY_BASE + GEN4_HDMIB,

					PORT_B);

					PORT_B);

		if (I915_READ(VLV_DISPLAY_BASE + DP_B) & DP_DETECTED ||

		if (I915_READ(VLV_DISPLAY_BASE + DP_B) & DP_DETECTED ||

		    intel_dp_is_edp(dev, PORT_B))

		    intel_dp_is_edp(dev, PORT_B))

			intel_dp_init(dev, VLV_DISPLAY_BASE + DP_B, PORT_B);

			intel_dp_init(dev, VLV_DISPLAY_BASE + DP_B, PORT_B);





		if (I915_READ(VLV_DISPLAY_BASE + GEN4_HDMIC) & SDVO_DETECTED)

		if (I915_READ(VLV_DISPLAY_BASE + GEN4_HDMIC) & SDVO_DETECTED &&

		    !intel_dp_is_edp(dev, PORT_C))

			intel_hdmi_init(dev, VLV_DISPLAY_BASE + GEN4_HDMIC,

			intel_hdmi_init(dev, VLV_DISPLAY_BASE + GEN4_HDMIC,

					PORT_C);

					PORT_C);

		if (I915_READ(VLV_DISPLAY_BASE + DP_C) & DP_DETECTED ||

		if (I915_READ(VLV_DISPLAY_BASE + DP_C) & DP_DETECTED ||