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

Commit 6f6005a5 authored by Jesse Barnes's avatar Jesse Barnes Committed by Daniel Vetter
Browse files

drm/i915: expose HDMI connectors on port C on BYT 



Ryan noticed that on his board, HDMI was wired up to port C but not
exposed by the kernel, which had only expected DP on that port.  Fix
that up by enumerating both ports if possible.

Tested-by: default avatar"Matsumura, Ryan" <ryan.matsumura@intel.com>
Acked-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
[danvet: Fix up the whitespace fail. Tsk.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 16e54061

drivers/gpu/drm/i915/intel_display.c

+7 −2
Original line number Original line Diff line number Diff line
@@ -9335,8 +9335,13 @@ static void intel_setup_outputs(struct drm_device *dev) 
			intel_dp_init(dev, PCH_DP_D, PORT_D);

			intel_dp_init(dev, PCH_DP_D, PORT_D);

	} else if (IS_VALLEYVIEW(dev)) {

	} else if (IS_VALLEYVIEW(dev)) {

		/* Check for built-in panel first. Shares lanes with HDMI on SDVOC */

		/* Check for built-in panel first. Shares lanes with HDMI on SDVOC */

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

			intel_hdmi_init(dev, VLV_DISPLAY_BASE + GEN4_HDMIC,

					PORT_C);

			if (I915_READ(VLV_DISPLAY_BASE + DP_C) & DP_DETECTED)

			if (I915_READ(VLV_DISPLAY_BASE + DP_C) & DP_DETECTED)

			intel_dp_init(dev, VLV_DISPLAY_BASE + DP_C, PORT_C);

				intel_dp_init(dev, VLV_DISPLAY_BASE + DP_C,

					      PORT_C);

		}





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

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

			intel_hdmi_init(dev, VLV_DISPLAY_BASE + GEN4_HDMIB,

			intel_hdmi_init(dev, VLV_DISPLAY_BASE + GEN4_HDMIB,