diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2022-07-27 09:41:28 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2022-07-27 09:41:28 +0200 |
| commit | e333ce018ab9583916934c063498f782bb060995 (patch) | |
| tree | 44417f411252ac612c24f67d905e3f0e2cbe7e97 /drivers/gpu/drm/i915/display/intel_ddi.c | |
| parent | 9c7f5cf088789957dcfb460cca1ab0fb578f2376 (diff) | |
| parent | 3565c7219c169ab6c6ef34ba9187c1b7bc6dbfa5 (diff) | |
Merge remote-tracking branch 'drm-intel/drm-intel-next' into drm-tip
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_ddi.c')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_ddi.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 2330604b0bcc..a4c8493f3ce7 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -2691,10 +2691,14 @@ static void intel_ddi_post_disable_hdmi(struct intel_atomic_state *state, dig_port->set_infoframes(encoder, false, old_crtc_state, old_conn_state); - intel_ddi_disable_pipe_clock(old_crtc_state); + if (DISPLAY_VER(dev_priv) < 12) + intel_ddi_disable_pipe_clock(old_crtc_state); intel_disable_ddi_buf(encoder, old_crtc_state); + if (DISPLAY_VER(dev_priv) >= 12) + intel_ddi_disable_pipe_clock(old_crtc_state); + intel_display_power_put(dev_priv, dig_port->ddi_io_power_domain, fetch_and_zero(&dig_port->ddi_io_wakeref)); |