mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-31 11:41:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/{i915, xe}: add intel_display_driver_pm_{suspend_late, resume_early}()

Browse Source 
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>
This commit is contained in:
Jani Nikula
2026-06-02 11:32:47 +03:00
parent f597d4b2fd
commit 91391b1a77
4 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/gpu/drm/i915/display/intel_display_driver.c
View File

@@ -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,

2
drivers/gpu/drm/i915/display/intel_display_driver.h
View File

@@ -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 */

6
drivers/gpu/drm/i915/i915_driver.c
View File

@@ -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);

4
drivers/gpu/drm/xe/display/xe_display.c
View File

@@ -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)