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

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

drm/i915: Pass VLV_DISPLAY_BASE + reg to intel_{hdmi, dp}_init on VLV 



When passing the DP/HDMI/SDVO registers to the encoder init functions,
include the VLV specific offset in the value.

v2: Resolved conflicts w/ VLV SDVO elimination

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 9d5f78fb

drivers/gpu/drm/i915/intel_display.c

+8 −8
Original line number Diff line number Diff line
@@ -8228,17 +8228,17 @@ static void intel_setup_outputs(struct drm_device *dev) 
			intel_dp_init(dev, PCH_DP_D, PORT_D);

	} else if (IS_VALLEYVIEW(dev)) {

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

		if (I915_READ(DP_C) & DP_DETECTED)

			intel_dp_init(dev, DP_C, PORT_C);

		if (I915_READ(VLV_DISPLAY_BASE + DP_C) & DP_DETECTED)

			intel_dp_init(dev, VLV_DISPLAY_BASE + DP_C, PORT_C);



		if (I915_READ(SDVOB) & PORT_DETECTED) {

			intel_hdmi_init(dev, SDVOB, PORT_B);

			if (I915_READ(DP_B) & DP_DETECTED)

				intel_dp_init(dev, DP_B, PORT_B);

		if (I915_READ(VLV_DISPLAY_BASE + SDVOB) & PORT_DETECTED) {

			intel_hdmi_init(dev, VLV_DISPLAY_BASE + SDVOB, PORT_B);

			if (I915_READ(VLV_DISPLAY_BASE + DP_B) & DP_DETECTED)

				intel_dp_init(dev, VLV_DISPLAY_BASE + DP_B, PORT_B);

		}



		if (I915_READ(SDVOC) & PORT_DETECTED)

			intel_hdmi_init(dev, SDVOC, PORT_C);

		if (I915_READ(VLV_DISPLAY_BASE + SDVOC) & PORT_DETECTED)

			intel_hdmi_init(dev, VLV_DISPLAY_BASE + SDVOC, PORT_C);



	} else if (SUPPORTS_DIGITAL_OUTPUTS(dev)) {

		bool found = false;