diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2026-06-02 11:32:47 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2026-06-04 13:50:09 +0300 |
| commit | 91391b1a77199b8dbdf2bb7973bddaf0263cbca8 (patch) | |
| tree | 61c5faa18572a7841352cc457de65cdea0dba91f | |
| parent | f597d4b2fd0d7ab17538d444e17302aca0a4d4ea (diff) | |
| download | linux-91391b1a77199b8dbdf2bb7973bddaf0263cbca8.tar.gz linux-91391b1a77199b8dbdf2bb7973bddaf0263cbca8.zip | |
drm/{i915, xe}: add intel_display_driver_pm_{suspend_late, resume_early}()
Add new functions intel_display_driver_pm_suspend_late() and
intel_display_driver_pm_resume_early(), to be called from the
corresponding struct dev_pm_ops hooks.
There's a slight functional change for !HAS_DISPLAY() in that the new
functions return early. Assume this is what we want, and there are no
cases where display engine is present but all pipes have been fused off.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/a429a0ea7ac8e97a98c26ffe5be5db934267ec8d.1780389001.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display_driver.c | 16 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display_driver.h | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/i915_driver.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/xe/display/xe_display.c | 4 |
4 files changed, 23 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c index f362532c6834..77fa4497b442 100644 --- a/drivers/gpu/drm/i915/display/intel_display_driver.c +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c @@ -714,6 +714,22 @@ int intel_display_driver_pm_suspend(struct intel_display *display) return ret; } +void intel_display_driver_pm_suspend_late(struct intel_display *display, bool s2idle) +{ + if (!HAS_DISPLAY(display)) + return; + + intel_display_power_suspend_late(display, s2idle); +} + +void intel_display_driver_pm_resume_early(struct intel_display *display) +{ + if (!HAS_DISPLAY(display)) + return; + + intel_display_power_resume_early(display); +} + int __intel_display_driver_resume(struct intel_display *display, struct drm_atomic_commit *state, diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.h b/drivers/gpu/drm/i915/display/intel_display_driver.h index d8a08ca68d4e..adfde02465ea 100644 --- a/drivers/gpu/drm/i915/display/intel_display_driver.h +++ b/drivers/gpu/drm/i915/display/intel_display_driver.h @@ -26,6 +26,8 @@ void intel_display_driver_remove_nogem(struct intel_display *display); void intel_display_driver_unregister(struct intel_display *display); int intel_display_driver_pm_suspend(struct intel_display *display); +void intel_display_driver_pm_suspend_late(struct intel_display *display, bool s2idle); +void intel_display_driver_pm_resume_early(struct intel_display *display); void intel_display_driver_pm_resume(struct intel_display *display); /* interface for intel_display_reset.c */ diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c index 063d4bdec2d9..6fd3e8b155b1 100644 --- a/drivers/gpu/drm/i915/i915_driver.c +++ b/drivers/gpu/drm/i915/i915_driver.c @@ -1181,12 +1181,12 @@ static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation) for_each_gt(gt, dev_priv, i) intel_uncore_suspend(gt->uncore); - intel_display_power_suspend_late(display, s2idle); + intel_display_driver_pm_suspend_late(display, s2idle); ret = vlv_suspend_complete(dev_priv); if (ret) { drm_err(&dev_priv->drm, "Suspend complete failed: %d\n", ret); - intel_display_power_resume_early(display); + intel_display_driver_pm_resume_early(display); } enable_rpm_wakeref_asserts(rpm); @@ -1345,7 +1345,7 @@ static int i915_drm_resume_early(struct drm_device *dev) for_each_gt(gt, dev_priv, i) intel_gt_resume_early(gt); - intel_display_power_resume_early(display); + intel_display_driver_pm_resume_early(display); enable_rpm_wakeref_asserts(&dev_priv->runtime_pm); diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c index 4f3f0b6162db..066f7f18b91e 100644 --- a/drivers/gpu/drm/xe/display/xe_display.c +++ b/drivers/gpu/drm/xe/display/xe_display.c @@ -335,7 +335,7 @@ void xe_display_pm_suspend_late(struct xe_device *xe) if (!xe->info.probe_display) return; - intel_display_power_suspend_late(display, s2idle); + intel_display_driver_pm_suspend_late(display, s2idle); } void xe_display_pm_resume_early(struct xe_device *xe) @@ -345,7 +345,7 @@ void xe_display_pm_resume_early(struct xe_device *xe) if (!xe->info.probe_display) return; - intel_display_power_resume_early(display); + intel_display_driver_pm_resume_early(display); } void xe_display_pm_resume(struct xe_device *xe) |