diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-02-06 08:28:34 -0300 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-02-06 08:28:34 -0300 |
commit | 9334030c3b94ca32af2e5afd02cb1c63307a2bea (patch) | |
tree | 51bd44f141decad700255a716a6b6924d7e2faf4 /drivers/gpu/drm/i915/display/intel_tc.c | |
parent | fc45e6588d57b65378612fce07089276141509dc (diff) | |
parent | 90c9e950c0def5c354b4a6154a2ddda3e5f214ac (diff) | |
download | linux-9334030c3b94ca32af2e5afd02cb1c63307a2bea.tar.gz linux-9334030c3b94ca32af2e5afd02cb1c63307a2bea.tar.bz2 linux-9334030c3b94ca32af2e5afd02cb1c63307a2bea.zip |
Merge remote-tracking branch 'torvalds/master' into perf/urgent
To check if more kernel API sync is needed and also to see if the perf
build tests continue to pass.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_tc.c')
-rw-r--r-- | drivers/gpu/drm/i915/display/intel_tc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c index 40faa18947c9..dbd7d0d83a14 100644 --- a/drivers/gpu/drm/i915/display/intel_tc.c +++ b/drivers/gpu/drm/i915/display/intel_tc.c @@ -345,10 +345,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", |