From 036ed1e18e5abbc877875c57072e711c1bf69729 Mon Sep 17 00:00:00 2001 From: jsg Date: Wed, 9 Feb 2022 04:16:26 +0000 Subject: [PATCH] drm/i915/adlp: Fix TypeC PHY-ready status readout From Imre Deak 39ac3945d966168bdede467446dec45cee3382bb in linux 5.15.y/5.15.22 3c6f13ad723e7206f03bb2752b01d18202b7fc9d in mainline linux --- sys/dev/pci/drm/i915/display/intel_tc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/pci/drm/i915/display/intel_tc.c b/sys/dev/pci/drm/i915/display/intel_tc.c index 29bfc8382ea..694ed0f406c 100644 --- a/sys/dev/pci/drm/i915/display/intel_tc.c +++ b/sys/dev/pci/drm/i915/display/intel_tc.c @@ -291,10 +291,11 @@ static bool icl_tc_phy_status_complete(struct intel_digital_port *dig_port) static bool adl_tc_phy_status_complete(struct intel_digital_port *dig_port) { struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev); + enum tc_port tc_port = intel_port_to_tc(i915, dig_port->base.port); struct intel_uncore *uncore = &i915->uncore; u32 val; - val = intel_uncore_read(uncore, TCSS_DDI_STATUS(dig_port->tc_phy_fia_idx)); + val = intel_uncore_read(uncore, TCSS_DDI_STATUS(tc_port)); if (val == 0xffffffff) { drm_dbg_kms(&i915->drm, "Port %s: PHY in TCCOLD, assuming not complete\n", -- 2.20.1