diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-02-04 15:48:26 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-02-04 15:48:27 +1000 |
| commit | 9ca3d3cd0857523c95ab8cdbb6cfe47b8f90e309 (patch) | |
| tree | fb4f74697e0cbad23e60211d106173ec6de39b37 /drivers/gpu/drm/i915/display/intel_tc.c | |
| parent | 8ea2c5187d7b4901a70374415e772f1db422fb74 (diff) | |
| parent | 7d73c602154df56802a9e75ac212505fc1e9a2b6 (diff) | |
| download | linux-9ca3d3cd0857523c95ab8cdbb6cfe47b8f90e309.tar.gz linux-9ca3d3cd0857523c95ab8cdbb6cfe47b8f90e309.tar.bz2 linux-9ca3d3cd0857523c95ab8cdbb6cfe47b8f90e309.zip | |
Merge tag 'drm-intel-fixes-2022-02-03' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes
Fix GitLab issue #4698: DP monitor through Type-C dock(Dell DA310) doesn't work.
Fixes for inconsistent engine busyness value and read timeout with GuC.
Fix to use ALLOW_FAIL for error capture buffer allocation. Don't use
interruptible lock on error path. Smatch fix to reject zero sized overlays.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/YfuiG8SKMKP5V/Dm@jlahtine-mobl.ger.corp.intel.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", |