Commit a5be0c97 authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

drm/i915/display: move vbt check to intel_ddi_init() 



Since commit 45c0673a ("drm/i915/bios: start using the
intel_bios_encoder_data directly") we lookup the devdata for each port
in intel_ddi_init() and just return if the port is not present in VBT
(or if we didn't create a fake devdata for it if VBT is not available).

So in intel_display.c we don't have to check
intel_bios_is_port_present(), just rely on the check in
intel_ddi_init().

v2: Rebase on commit 45c0673a ("drm/i915/bios: start using the
intel_bios_encoder_data directly") re-using that check in intel_ddi_init()
instead of adding a new one.

Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210430223808.1078010-2-lucas.demarchi@intel.com
parent 8a405373

drivers/gpu/drm/i915/display/intel_display.c

+6 −8
Original line number Diff line number Diff line
@@ -11199,13 +11199,13 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) 
		intel_ddi_init(dev_priv, PORT_C);

		intel_ddi_init(dev_priv, PORT_D);

		intel_ddi_init(dev_priv, PORT_E);



		/*

		 * On some ICL SKUs port F is not present. No strap bits for

		 * this, so rely on VBT.

		 * Work around broken VBTs on SKUs known to have no port F.

		 * On some ICL SKUs port F is not present, but broken VBTs mark

		 * the port as present. Only try to initialize port F for the

		 * SKUs that may actually have it.

		 */

		if (IS_ICL_WITH_PORT_F(dev_priv) &&

		    intel_bios_is_port_present(dev_priv, PORT_F))

		if (IS_ICL_WITH_PORT_F(dev_priv))

			intel_ddi_init(dev_priv, PORT_F);



		icl_dsi_init(dev_priv);
@@ -11259,10 +11259,8 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) 
		/*

		 * On SKL we don't have a way to detect DDI-E so we rely on VBT.

		 */

		if (DISPLAY_VER(dev_priv) == 9 &&

		    intel_bios_is_port_present(dev_priv, PORT_E))

		if (DISPLAY_VER(dev_priv) == 9)

			intel_ddi_init(dev_priv, PORT_E);



	} else if (HAS_PCH_SPLIT(dev_priv)) {

		int found;