[PATCH 0/2] drm/i915: .runtime_suspend/.runtime_resume renames for clarity

[PATCH 0/2] drm/i915: .runtime_suspend/.runtime_resume renames for clarity

[Jani Nikula]

Jani Nikula (2):
  drm/i915/power: add "runtime" to
    intel_display_power_{suspend,resume}() names
  drm/i915: rename intel_runtime_{suspend,resume} to
    i915_pm_runtime_{suspend,resume}

 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                 | 14 +++++++-------
 3 files changed, 12 insertions(+), 11 deletions(-)

-- 
2.47.3

[PATCH 1/2] drm/i915/power: add "runtime" to intel_display_power_{suspend, resume}() names

[Jani Nikula]

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 <imre.deak@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 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);
+
 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

Re: [PATCH 1/2] drm/i915/power: add "runtime" to intel_display_power_{suspend,resume}() names

[Imre Deak]

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 <imre.deak@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  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 <imre.deak@intel.coM>

I wondered why the above prototypes moved later.

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

Re: [PATCH 1/2] drm/i915/power: add "runtime" to intel_display_power_{suspend,resume}() names

[Jani Nikula]

On Wed, 27 May 2026, Imre Deak <imre.deak@intel.com> 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 <imre.deak@intel.com>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>>  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 <imre.deak@intel.coM>
>
> 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

[PATCH 2/2] drm/i915: rename intel_runtime_{suspend, resume} to i915_pm_runtime_{suspend, resume}

[Jani Nikula]

All the other struct dev_pm_ops hooks are named i915_pm_*(), but the
.runtime_suspend and .runtime_resume hooks are called
intel_runtime_suspend() and intel_runtime_resume(), respectively.

Rename intel_runtime_suspend() to i915_pm_runtime_suspend() and
intel_runtime_resume() to i915_pm_runtime_resume() to unify.

Cc: Imre Deak <imre.deak@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/i915_driver.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index d6b94a29c91d..58081b52461a 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -1558,7 +1558,7 @@ static int i915_pm_restore(struct device *kdev)
 	return i915_pm_resume(kdev);
 }
 
-static int intel_runtime_suspend(struct device *kdev)
+static int i915_pm_runtime_suspend(struct device *kdev)
 {
 	struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
 	struct intel_display *display = dev_priv->display;
@@ -1632,7 +1632,7 @@ static int intel_runtime_suspend(struct device *kdev)
 	if (IS_BROADWELL(dev_priv)) {
 		/*
 		 * On Broadwell, if we use PCI_D1 the PCH DDI ports will stop
-		 * being detected, and the call we do at intel_runtime_resume()
+		 * being detected, and the call we do at i915_pm_runtime_resume()
 		 * won't be able to restore them. Since PCI_D3hot matches the
 		 * actual specification and appears to be working, use it.
 		 */
@@ -1657,7 +1657,7 @@ static int intel_runtime_suspend(struct device *kdev)
 	return 0;
 }
 
-static int intel_runtime_resume(struct device *kdev)
+static int i915_pm_runtime_resume(struct device *kdev)
 {
 	struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
 	struct intel_display *display = dev_priv->display;
@@ -1765,8 +1765,8 @@ const struct dev_pm_ops i915_pm_ops = {
 	.restore = i915_pm_restore,
 
 	/* S0ix (via runtime suspend) event handlers */
-	.runtime_suspend = intel_runtime_suspend,
-	.runtime_resume = intel_runtime_resume,
+	.runtime_suspend = i915_pm_runtime_suspend,
+	.runtime_resume = i915_pm_runtime_resume,
 };
 
 static const struct file_operations i915_driver_fops = {
-- 
2.47.3

Re: [PATCH 2/2] drm/i915: rename intel_runtime_{suspend,resume} to i915_pm_runtime_{suspend,resume}

[Imre Deak]

On Wed, May 27, 2026 at 01:02:12PM +0300, Jani Nikula wrote:
> All the other struct dev_pm_ops hooks are named i915_pm_*(), but the
> .runtime_suspend and .runtime_resume hooks are called
> intel_runtime_suspend() and intel_runtime_resume(), respectively.
> 
> Rename intel_runtime_suspend() to i915_pm_runtime_suspend() and
> intel_runtime_resume() to i915_pm_runtime_resume() to unify.
> 
> Cc: Imre Deak <imre.deak@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Imre Deak <imre.deak@intel.com>

> ---
>  drivers/gpu/drm/i915/i915_driver.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> index d6b94a29c91d..58081b52461a 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -1558,7 +1558,7 @@ static int i915_pm_restore(struct device *kdev)
>  	return i915_pm_resume(kdev);
>  }
>  
> -static int intel_runtime_suspend(struct device *kdev)
> +static int i915_pm_runtime_suspend(struct device *kdev)
>  {
>  	struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
>  	struct intel_display *display = dev_priv->display;
> @@ -1632,7 +1632,7 @@ static int intel_runtime_suspend(struct device *kdev)
>  	if (IS_BROADWELL(dev_priv)) {
>  		/*
>  		 * On Broadwell, if we use PCI_D1 the PCH DDI ports will stop
> -		 * being detected, and the call we do at intel_runtime_resume()
> +		 * being detected, and the call we do at i915_pm_runtime_resume()
>  		 * won't be able to restore them. Since PCI_D3hot matches the
>  		 * actual specification and appears to be working, use it.
>  		 */
> @@ -1657,7 +1657,7 @@ static int intel_runtime_suspend(struct device *kdev)
>  	return 0;
>  }
>  
> -static int intel_runtime_resume(struct device *kdev)
> +static int i915_pm_runtime_resume(struct device *kdev)
>  {
>  	struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
>  	struct intel_display *display = dev_priv->display;
> @@ -1765,8 +1765,8 @@ const struct dev_pm_ops i915_pm_ops = {
>  	.restore = i915_pm_restore,
>  
>  	/* S0ix (via runtime suspend) event handlers */
> -	.runtime_suspend = intel_runtime_suspend,
> -	.runtime_resume = intel_runtime_resume,
> +	.runtime_suspend = i915_pm_runtime_suspend,
> +	.runtime_resume = i915_pm_runtime_resume,
>  };
>  
>  static const struct file_operations i915_driver_fops = {
> -- 
> 2.47.3
> 

✗ i915.CI.BAT: failure for drm/i915: .runtime_suspend/.runtime_resume renames for clarity

[Patchwork]

[-- Attachment #1: Type: text/plain, Size: 2995 bytes --]

== Series Details ==

Series: drm/i915: .runtime_suspend/.runtime_resume renames for clarity
URL   : https://patchwork.freedesktop.org/series/167358/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_18559 -> Patchwork_167358v1
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with Patchwork_167358v1 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_167358v1, please notify your bug team (I915-ci-infra@lists.freedesktop.org) to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_167358v1/index.html

Participating hosts (42 -> 40)
------------------------------

  Missing    (2): bat-dg2-13 fi-snb-2520m 

Possible new issues
-------------------

  Here are the unknown changes that may have been introduced in Patchwork_167358v1:

### IGT changes ###

#### Possible regressions ####

  * igt@i915_selftest@live@guc_multi_lrc:
    - bat-arlh-3:         [PASS][1] -> [INCOMPLETE][2]
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18559/bat-arlh-3/igt@i915_selftest@live@guc_multi_lrc.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_167358v1/bat-arlh-3/igt@i915_selftest@live@guc_multi_lrc.html

  
Known issues
------------

  Here are the changes found in Patchwork_167358v1 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@i915_selftest@live:
    - bat-arlh-3:         [PASS][3] -> [INCOMPLETE][4] ([i915#16139])
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18559/bat-arlh-3/igt@i915_selftest@live.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_167358v1/bat-arlh-3/igt@i915_selftest@live.html

  
#### Possible fixes ####

  * igt@kms_cursor_legacy@basic-flip-after-cursor-varying-size:
    - fi-bsw-n3050:       [FAIL][5] ([i915#16140]) -> [PASS][6]
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_18559/fi-bsw-n3050/igt@kms_cursor_legacy@basic-flip-after-cursor-varying-size.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_167358v1/fi-bsw-n3050/igt@kms_cursor_legacy@basic-flip-after-cursor-varying-size.html

  
  [i915#16139]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/16139
  [i915#16140]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/16140


Build changes
-------------

  * Linux: CI_DRM_18559 -> Patchwork_167358v1

  CI-20190529: 20190529
  CI_DRM_18559: 22b896d923da45ef89f2f0991e3a09146be635d9 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_8938: b024a3b67372962ff6e643d3998c5cf5acc07081 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
  Patchwork_167358v1: 22b896d923da45ef89f2f0991e3a09146be635d9 @ git://anongit.freedesktop.org/gfx-ci/linux

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_167358v1/index.html

[-- Attachment #2: Type: text/html, Size: 3646 bytes --]