diff options
| author | Imre Deak <imre.deak@intel.com> | 2024-07-22 19:54:53 +0300 |
|---|---|---|
| committer | Imre Deak <imre.deak@intel.com> | 2024-07-31 18:45:59 +0300 |
| commit | a64d5fe490cd92d74b1cf46da63164cefcc61a58 (patch) | |
| tree | e53472d7aea3e3b43b6ca6a4a9c942f6fdcf6d01 | |
| parent | 0cf09702a118b1c09b694862061913108565edd0 (diff) | |
| download | linux-a64d5fe490cd92d74b1cf46da63164cefcc61a58.tar.xz | |
drm/i915/ddi: For an active output call the DP encoder sync_state() only for DP
If the DDI encoder output is enabled in HDMI mode there is no point in
calling intel_dp_sync_state(), as in that case the DPCD initialization
will fail - as expected - with AUX timeouts. Prevent calling the hook in
this case.
Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240722165503.2084999-5-imre.deak@intel.com
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_ddi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index a07aca96e551..11ee4406dce8 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -4172,7 +4172,8 @@ static void intel_ddi_sync_state(struct intel_encoder *encoder, intel_tc_port_sanitize_mode(enc_to_dig_port(encoder), crtc_state); - if (intel_encoder_is_dp(encoder)) + if ((crtc_state && intel_crtc_has_dp_encoder(crtc_state)) || + (!crtc_state && intel_encoder_is_dp(encoder))) intel_dp_sync_state(encoder, crtc_state); } |