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

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

drm/i915: VLV doesn't have SDVO 



Don't call intel_sdvo_init() for VLV.

Preserve the same behaviour as when intel_sdvo_init() would
have returned false.

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

drivers/gpu/drm/i915/intel_display.c

+2 −7
Original line number Diff line number Diff line
@@ -8227,18 +8227,13 @@ static void intel_setup_outputs(struct drm_device *dev) 
		if (I915_READ(PCH_DP_D) & DP_DETECTED)

			intel_dp_init(dev, PCH_DP_D, PORT_D);

	} else if (IS_VALLEYVIEW(dev)) {

		int found;



		/* 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(SDVOB) & PORT_DETECTED) {

			/* SDVOB multiplex with HDMIB */

			found = intel_sdvo_init(dev, SDVOB, true);

			if (!found)

			intel_hdmi_init(dev, SDVOB, PORT_B);

			if (!found && (I915_READ(DP_B) & DP_DETECTED))

			if (I915_READ(DP_B) & DP_DETECTED)

				intel_dp_init(dev, DP_B, PORT_B);

		}