OSDN Git Service

drm/i915/mtl: Fix expected reg value for Thunderbolt PLL disabling
authorMika Kahola <mika.kahola@intel.com>
Fri, 12 May 2023 12:00:03 +0000 (15:00 +0300)
committerRadhakrishna Sripada <radhakrishna.sripada@intel.com>
Thu, 18 May 2023 16:24:11 +0000 (09:24 -0700)
While disabling Thunderbolt PLL, we request PLL to be stopped and
wait for ACK bit to be cleared. The expected value should be '0'
instead of '~XELPDP_TBT_CLOCK_ACK' or otherwise we incorrectly
receive dmesg warn "PHY PLL not unlocked in 10us".

Signed-off-by: Mika Kahola <mika.kahola@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230512120003.587360-1-mika.kahola@intel.com
drivers/gpu/drm/i915/display/intel_cx0_phy.c

index ef0615c..c0755ac 100644 (file)
@@ -2861,9 +2861,7 @@ static void intel_mtl_tbt_pll_disable(struct intel_encoder *encoder)
 
        /* 3. Poll on PORT_CLOCK_CTL TBT CLOCK Ack == "0". */
        if (__intel_de_wait_for_register(i915, XELPDP_PORT_CLOCK_CTL(encoder->port),
-                                        XELPDP_TBT_CLOCK_ACK,
-                                        ~XELPDP_TBT_CLOCK_ACK,
-                                        10, 0, NULL))
+                                        XELPDP_TBT_CLOCK_ACK, 0, 10, 0, NULL))
                drm_warn(&i915->drm, "[ENCODER:%d:%s][%c] PHY PLL not unlocked after 10us.\n",
                         encoder->base.base.id, encoder->base.name, phy_name(phy));