drm/i915/display: Fix the encoder type check (8e68c634) · Commits · 戴 / test

For all ddi, encoder->type holds output type as ddi, assigning it to individual o/p types is no more valid. Fixes: ("drm/i915/tgl: Add DKL PHY vswing table for HDMI") v2: Rebase, no functional change. Signed-off-by:

Vandita Kulkarni <vandita.kulkarni@intel.com> Reviewed-by:

Uma Shankar <uma.shankar@intel.com> Signed-off-by:

Uma Shankar <uma.shankar@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200612082237.11886-1-vandita.kulkarni@intel.com (cherry picked from commit ) Signed-off-by:

Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -2579,14 +2579,14 @@ static void icl_ddi_vswing_sequence(struct intel_encoder *encoder,

		static void
		tgl_dkl_phy_ddi_vswing_sequence(struct intel_encoder *encoder, int link_clock,
		u32 level)
		u32 level, enum intel_output_type type)
		{
		struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
		enum tc_port tc_port = intel_port_to_tc(dev_priv, encoder->port);
		const struct tgl_dkl_phy_ddi_buf_trans *ddi_translations;
		u32 n_entries, val, ln, dpcnt_mask, dpcnt_val;

		if (encoder->type == INTEL_OUTPUT_HDMI) {
		if (type == INTEL_OUTPUT_HDMI) {
		n_entries = ARRAY_SIZE(tgl_dkl_phy_hdmi_ddi_trans);
		ddi_translations = tgl_dkl_phy_hdmi_ddi_trans;
		} else {
		@@ -2638,7 +2638,7 @@ static void tgl_ddi_vswing_sequence(struct intel_encoder *encoder,
		if (intel_phy_is_combo(dev_priv, phy))
		icl_combo_phy_ddi_vswing_sequence(encoder, level, type);
		else
		tgl_dkl_phy_ddi_vswing_sequence(encoder, link_clock, level);
		tgl_dkl_phy_ddi_vswing_sequence(encoder, link_clock, level, type);
		}

		static u32 translate_signal_level(struct intel_dp *intel_dp, int signal_levels)

Admin message