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

drm/i915/display: add "pm" to intel_display_driver_{suspend, resume}() names

Browse Source 
Start naming the functions that are supposed to be called from the
struct dem_pm_ops hooks with intel_display_driver_pm_*() to distinguish
them better from the rest.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/b4dd07b6375752900f583d56eda16a1c2a0b1e49.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:41 +03:00
parent bd61c7756b
commit b70bd3d40d
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -678,7 +678,7 @@ void intel_display_driver_unregister(struct intel_display *display)
* turn all crtc's off, but do not adjust state
* This has to be paired with a call to intel_modeset_setup_hw_state.
*/
int intel_display_driver_suspend(struct intel_display *display)
int intel_display_driver_pm_suspend(struct intel_display *display)
{
struct drm_atomic_commit *state;
int ret;
@@ -741,7 +741,7 @@ __intel_display_driver_resume(struct intel_display *display,
return ret;
}
void intel_display_driver_resume(struct intel_display *display)
void intel_display_driver_pm_resume(struct intel_display *display)
{
struct drm_atomic_commit *state = display->restore.modeset_state;
struct drm_modeset_acquire_ctx ctx;

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

@@ -24,8 +24,9 @@ void intel_display_driver_remove(struct intel_display *display);
void intel_display_driver_remove_noirq(struct intel_display *display);
void intel_display_driver_remove_nogem(struct intel_display *display);
void intel_display_driver_unregister(struct intel_display *display);
int intel_display_driver_suspend(struct intel_display *display);
void intel_display_driver_resume(struct intel_display *display);
int intel_display_driver_pm_suspend(struct intel_display *display);
void intel_display_driver_pm_resume(struct intel_display *display);
/* interface for intel_display_reset.c */
int __intel_display_driver_resume(struct intel_display *display,

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

@@ -1114,10 +1114,10 @@ static int i915_drm_prepare(struct drm_device *dev)
intel_pxp_suspend_prepare(i915->pxp);
/*
* NB intel_display_driver_suspend() may issue new requests after we've
* ostensibly marked the GPU as ready-to-sleep here. We need to
* split out that work and pull it forward so that after point,
* the GPU is not woken again.
* NB intel_display_driver_pm_suspend() may issue new requests after
* we've ostensibly marked the GPU as ready-to-sleep here. We need to
* split out that work and pull it forward so that after point, the GPU
* is not woken again.
*/
return i915_gem_backup_suspend(i915);
}
@@ -1139,7 +1139,7 @@ static int i915_drm_suspend(struct drm_device *dev)
intel_display_driver_disable_user_access(display);
}
intel_display_driver_suspend(display);
intel_display_driver_pm_suspend(display);
intel_encoder_block_all_hpds(display);
@@ -1325,7 +1325,7 @@ static int i915_drm_resume(struct drm_device *dev)
intel_encoder_unblock_all_hpds(display);
intel_display_driver_resume(display);
intel_display_driver_pm_resume(display);
if (intel_display_device_present(display)) {
intel_display_driver_enable_user_access(display);

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

@@ -330,7 +330,7 @@ void xe_display_pm_suspend(struct xe_device *xe)
if (intel_display_device_present(display)) {
drm_kms_helper_poll_disable(&xe->drm);
intel_display_driver_disable_user_access(display);
intel_display_driver_suspend(display);
intel_display_driver_pm_suspend(display);
}
intel_encoder_block_all_hpds(display);
@@ -360,7 +360,7 @@ void xe_display_pm_shutdown(struct xe_device *xe)
if (intel_display_device_present(display)) {
drm_kms_helper_poll_disable(&xe->drm);
intel_display_driver_disable_user_access(display);
intel_display_driver_suspend(display);
intel_display_driver_pm_suspend(display);
}
intel_encoder_block_all_hpds(display);
@@ -468,7 +468,7 @@ void xe_display_pm_resume(struct xe_device *xe)
intel_encoder_unblock_all_hpds(display);
if (intel_display_device_present(display)) {
intel_display_driver_resume(display);
intel_display_driver_pm_resume(display);
intel_display_driver_enable_user_access(display);
drm_kms_helper_poll_enable(&xe->drm);
}