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

Commit 74d021ea authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/crt: simplify CRT VBT check on pre-VLV/DDI 



The VBT int_crt_support can't be trusted on earlier platforms, and is
always set to true in intel_bios.c for pre-DDI and pre-VLV platforms. We
can simplify the output setup by unconditionally calling
intel_crt_init() for these platforms.

Suggested-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190122082307.4003-7-jani.nikula@intel.com
parent 346073ce

drivers/gpu/drm/i915/intel_display.c

+4 −11
Original line number Diff line number Diff line
@@ -14382,8 +14382,6 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) 
		 * incorrect sharing of the PPS.

		 */

		intel_lvds_init(dev_priv);



		if (dev_priv->vbt.int_crt_support)

		intel_crt_init(dev_priv);



		dpd_is_edp = intel_dp_is_port_edp(dev_priv, PORT_D);
@@ -14461,8 +14459,6 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) 
		vlv_dsi_init(dev_priv);

	} else if (IS_PINEVIEW(dev_priv)) {

		intel_lvds_init(dev_priv);



		if (dev_priv->vbt.int_crt_support)

		intel_crt_init(dev_priv);

	} else if (IS_GEN_RANGE(dev_priv, 3, 4)) {

		bool found = false;
@@ -14470,7 +14466,6 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) 
		if (IS_MOBILE(dev_priv))

			intel_lvds_init(dev_priv);



		if (dev_priv->vbt.int_crt_support)

		intel_crt_init(dev_priv);



		if (I915_READ(GEN3_SDVOB) & SDVO_DETECTED) {
@@ -14511,9 +14506,7 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) 
		if (IS_I85X(dev_priv))

			intel_lvds_init(dev_priv);



		if (dev_priv->vbt.int_crt_support)

		intel_crt_init(dev_priv);



		intel_dvo_init(dev_priv);

	}