On Wed, 27 May 2026, Imre Deak <[email protected]> wrote:
> On Wed, May 27, 2026 at 01:02:11PM +0300, Jani Nikula wrote:
>> The intel_display_power_suspend() and intel_display_power_resume()
>> functions are supposed to be called from the struct dev_pm_pops
>> .runtime_suspend and .runtime_resume hook paths. Name them accordingly
>> to intel_display_power_runtime_suspend() and
>> intel_display_power_runtime_resume().
>>
>> Cc: Imre Deak <[email protected]>
>> Signed-off-by: Jani Nikula <[email protected]>
>> ---
>> drivers/gpu/drm/i915/display/intel_display_power.c | 4 ++--
>> drivers/gpu/drm/i915/display/intel_display_power.h | 5 +++--
>> drivers/gpu/drm/i915/i915_driver.c | 4 ++--
>> 3 files changed, 7 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c
>> b/drivers/gpu/drm/i915/display/intel_display_power.c
>> index b2dcfeedbd2c..2e51dfcd5dce 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display_power.c
>> +++ b/drivers/gpu/drm/i915/display/intel_display_power.c
>> @@ -2289,7 +2289,7 @@ void intel_display_power_resume_early(struct
>> intel_display *display)
>> intel_power_domains_resume(display);
>> }
>>
>> -void intel_display_power_suspend(struct intel_display *display)
>> +void intel_display_power_runtime_suspend(struct intel_display *display)
>> {
>> if (DISPLAY_VER(display) >= 11) {
>> icl_display_core_uninit(display);
>> @@ -2302,7 +2302,7 @@ void intel_display_power_suspend(struct intel_display
>> *display)
>> }
>> }
>>
>> -void intel_display_power_resume(struct intel_display *display)
>> +void intel_display_power_runtime_resume(struct intel_display *display)
>> {
>> struct i915_power_domains *power_domains = &display->power.domains;
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_display_power.h
>> b/drivers/gpu/drm/i915/display/intel_display_power.h
>> index a43fab19e530..56dc89eed3f8 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display_power.h
>> +++ b/drivers/gpu/drm/i915/display/intel_display_power.h
>> @@ -179,12 +179,13 @@ void intel_display_power_sanitize_state(struct
>> intel_display *display);
>>
>> void intel_display_power_suspend_late(struct intel_display *display, bool
>> s2idle);
>> void intel_display_power_resume_early(struct intel_display *display);
>> -void intel_display_power_suspend(struct intel_display *display);
>> -void intel_display_power_resume(struct intel_display *display);
>> void intel_display_power_set_target_dc_state(struct intel_display *display,
>> u32 state);
>> u32 intel_display_power_get_current_dc_state(struct intel_display *display);
>>
>> +void intel_display_power_runtime_suspend(struct intel_display *display);
>> +void intel_display_power_runtime_resume(struct intel_display *display);
>> +
>
> Reviewed-by: Imre Deak <[email protected]>
>
> I wondered why the above prototypes moved later.
Just to group runtime suspend/resume separate from suspend/resume.
>
>> bool intel_display_power_is_enabled(struct intel_display *display,
>> enum intel_display_power_domain domain);
>> struct ref_tracker *intel_display_power_get(struct intel_display *display,
>> diff --git a/drivers/gpu/drm/i915/i915_driver.c
>> b/drivers/gpu/drm/i915/i915_driver.c
>> index 8b93bac600bf..d6b94a29c91d 100644
>> --- a/drivers/gpu/drm/i915/i915_driver.c
>> +++ b/drivers/gpu/drm/i915/i915_driver.c
>> @@ -1591,7 +1591,7 @@ static int intel_runtime_suspend(struct device *kdev)
>> for_each_gt(gt, dev_priv, i)
>> intel_uncore_suspend(gt->uncore);
>>
>> - intel_display_power_suspend(display);
>> + intel_display_power_runtime_suspend(display);
>>
>> ret = vlv_suspend_complete(dev_priv);
>> if (ret) {
>> @@ -1685,7 +1685,7 @@ static int intel_runtime_resume(struct device *kdev)
>> drm_dbg(&dev_priv->drm,
>> "Unclaimed access during suspend, bios?\n");
>>
>> - intel_display_power_resume(display);
>> + intel_display_power_runtime_resume(display);
>>
>> ret = vlv_resume_prepare(dev_priv, true);
>>
>> --
>> 2.47.3
>>
--
Jani Nikula, Intel
