Skip to content

Commit 8e68c63

Browse files
Vanditakulkarnijlahtine-intel
authored andcommitted
drm/i915/display: Fix the encoder type check
For all ddi, encoder->type holds output type as ddi, assigning it to individual o/p types is no more valid. Fixes: 362bfb9 ("drm/i915/tgl: Add DKL PHY vswing table for HDMI") v2: Rebase, no functional change. Signed-off-by: Vandita Kulkarni <[email protected]> Reviewed-by: Uma Shankar <[email protected]> Signed-off-by: Uma Shankar <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit 94641eb) Signed-off-by: Joonas Lahtinen <[email protected]>
1 parent a3005c2 commit 8e68c63

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2579,14 +2579,14 @@ static void icl_ddi_vswing_sequence(struct intel_encoder *encoder,
25792579

25802580
static void
25812581
tgl_dkl_phy_ddi_vswing_sequence(struct intel_encoder *encoder, int link_clock,
2582-
u32 level)
2582+
u32 level, enum intel_output_type type)
25832583
{
25842584
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
25852585
enum tc_port tc_port = intel_port_to_tc(dev_priv, encoder->port);
25862586
const struct tgl_dkl_phy_ddi_buf_trans *ddi_translations;
25872587
u32 n_entries, val, ln, dpcnt_mask, dpcnt_val;
25882588

2589-
if (encoder->type == INTEL_OUTPUT_HDMI) {
2589+
if (type == INTEL_OUTPUT_HDMI) {
25902590
n_entries = ARRAY_SIZE(tgl_dkl_phy_hdmi_ddi_trans);
25912591
ddi_translations = tgl_dkl_phy_hdmi_ddi_trans;
25922592
} else {
@@ -2638,7 +2638,7 @@ static void tgl_ddi_vswing_sequence(struct intel_encoder *encoder,
26382638
if (intel_phy_is_combo(dev_priv, phy))
26392639
icl_combo_phy_ddi_vswing_sequence(encoder, level, type);
26402640
else
2641-
tgl_dkl_phy_ddi_vswing_sequence(encoder, link_clock, level);
2641+
tgl_dkl_phy_ddi_vswing_sequence(encoder, link_clock, level, type);
26422642
}
26432643

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

0 commit comments

Comments
 (0)