diff options
| author | Imre Deak <imre.deak@intel.com> | 2026-06-01 13:34:56 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2026-06-01 23:50:58 +0300 |
| commit | 1ac0574589f29bf49aacacb97ff50a3041fd97b4 (patch) | |
| tree | 1691eaf0fce4c2f2df981d37c95e787528fc8725 | |
| parent | 7185566c3db090aa5e17a17bca92dfcef9656b03 (diff) | |
drm/i915: Keep display IRQs enabled for encoder suspend/shutdown
A pending hotplug work or the encoder suspend/shutdown hooks may still
require display IRQs at least for AUX accesses, so keep all display IRQs
except for hotplug IRQs enabled until after intel_hpd_cancel_work() and
the encoder suspend/shutdown hooks are called during system suspend and
shutdown.
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://patch.msgid.link/0b4b4d489f91be9334554e5438d3f2aa79421d42.1780310011.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_driver.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c index 58081b52461a..93940cfe91a0 100644 --- a/drivers/gpu/drm/i915/i915_driver.c +++ b/drivers/gpu/drm/i915/i915_driver.c @@ -1055,7 +1055,8 @@ void i915_driver_shutdown(struct drm_i915_private *i915) intel_dp_mst_suspend(display); - intel_irq_suspend(i915); + intel_encoder_block_all_hpds(display); + intel_hpd_cancel_work(display); if (intel_display_device_present(display)) @@ -1064,6 +1065,8 @@ void i915_driver_shutdown(struct drm_i915_private *i915) intel_encoder_suspend_all(display); intel_encoder_shutdown_all(display); + intel_irq_suspend(i915); + intel_dmc_suspend(display); i915_gem_suspend(i915); @@ -1135,7 +1138,8 @@ static int i915_drm_suspend(struct drm_device *dev) intel_display_driver_suspend(display); - intel_irq_suspend(dev_priv); + intel_encoder_block_all_hpds(display); + intel_hpd_cancel_work(display); if (intel_display_device_present(display)) @@ -1143,6 +1147,8 @@ static int i915_drm_suspend(struct drm_device *dev) intel_encoder_suspend_all(display); + intel_irq_suspend(dev_priv); + /* Must be called before GGTT is suspended. */ intel_dpt_suspend(display); i915_ggtt_suspend(to_gt(dev_priv)->ggtt); @@ -1314,6 +1320,8 @@ static int i915_drm_resume(struct drm_device *dev) intel_hpd_init(display); + intel_encoder_unblock_all_hpds(display); + intel_display_driver_resume(display); if (intel_display_device_present(display)) { |