drm/i915/mtl: Fix HDMI/DP PLL clock selection
authorImre Deak <imre.deak@intel.com>
Wed, 13 Dec 2023 22:05:26 +0000 (00:05 +0200)
committerJani Nikula <jani.nikula@intel.com>
Mon, 18 Dec 2023 13:29:19 +0000 (15:29 +0200)
Select the HDMI specific PLL clock only for HDMI outputs.

Fixes: 62618c7f117e ("drm/i915/mtl: C20 PLL programming")
Cc: Mika Kahola <mika.kahola@intel.com>
Cc: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
Reviewed-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231213220526.1828827-1-imre.deak@intel.com
(cherry picked from commit 937d02cc79c6828fef28a4d80d8d0ad2f7bf2b62)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/display/intel_cx0_phy.c

index d414f6b7f993c220aaf78aa2efc718a09724d8f0..ccf225afeb2ad36ca139c75538b467f6ce67d3f6 100644 (file)
@@ -2465,7 +2465,8 @@ static void intel_program_port_clock_ctl(struct intel_encoder *encoder,
 
        val |= XELPDP_FORWARD_CLOCK_UNGATE;
 
-       if (is_hdmi_frl(crtc_state->port_clock))
+       if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI) &&
+           is_hdmi_frl(crtc_state->port_clock))
                val |= XELPDP_DDI_CLOCK_SELECT(XELPDP_DDI_CLOCK_SELECT_DIV18CLK);
        else
                val |= XELPDP_DDI_CLOCK_SELECT(XELPDP_DDI_CLOCK_SELECT_MAXPCLK);