Re: [PATCH v2 5/6] drm/i915/display: Use display parent interface for i915 runtime pm

[Jani Nikula <jani.nikula@intel.com>]

On Fri, 24 Oct 2025, Jouni Högander <jouni.hogander@intel.com> wrote:
> Start using display parent interface for i915 runtime pm. Doing the same
> for xe is done in coming changes.
>
> v2:
>   - use <> when including drm/intel/display_parent_interface.h
>   - drop checks for validity of rpm function pointers
>
> Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
> ---
>  .../gpu/drm/i915/display/intel_display_rpm.c  | 32 ++++++++-----------
>  1 file changed, 13 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_rpm.c b/drivers/gpu/drm/i915/display/intel_display_rpm.c
> index 56c4024201c16..3a6b86842b496 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_rpm.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_rpm.c
> @@ -1,69 +1,63 @@
>  // SPDX-License-Identifier: MIT
>  /* Copyright © 2025 Intel Corporation */
>  
> +#include <drm/intel/display_parent_interface.h>
> +
>  #include "i915_drv.h"

I'm guessing you could remove this too.

Anyway,

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

>  #include "intel_display_core.h"
>  #include "intel_display_rpm.h"
> -#include "intel_runtime_pm.h"
> -
> -static struct intel_runtime_pm *display_to_rpm(struct intel_display *display)
> -{
> -	struct drm_i915_private *i915 = to_i915(display->drm);
> -
> -	return &i915->runtime_pm;
> -}
>  
>  struct ref_tracker *intel_display_rpm_get_raw(struct intel_display *display)
>  {
> -	return intel_runtime_pm_get_raw(display_to_rpm(display));
> +	return display->parent->rpm->get_raw(display->drm);
>  }
>  
>  void intel_display_rpm_put_raw(struct intel_display *display, struct ref_tracker *wakeref)
>  {
> -	intel_runtime_pm_put_raw(display_to_rpm(display), wakeref);
> +	display->parent->rpm->put_raw(display->drm, wakeref);
>  }
>  
>  struct ref_tracker *intel_display_rpm_get(struct intel_display *display)
>  {
> -	return intel_runtime_pm_get(display_to_rpm(display));
> +	return display->parent->rpm->get(display->drm);
>  }
>  
>  struct ref_tracker *intel_display_rpm_get_if_in_use(struct intel_display *display)
>  {
> -	return intel_runtime_pm_get_if_in_use(display_to_rpm(display));
> +	return display->parent->rpm->get_if_in_use(display->drm);
>  }
>  
>  struct ref_tracker *intel_display_rpm_get_noresume(struct intel_display *display)
>  {
> -	return intel_runtime_pm_get_noresume(display_to_rpm(display));
> +	return display->parent->rpm->get_noresume(display->drm);
>  }
>  
>  void intel_display_rpm_put(struct intel_display *display, struct ref_tracker *wakeref)
>  {
> -	intel_runtime_pm_put(display_to_rpm(display), wakeref);
> +	display->parent->rpm->put(display->drm, wakeref);
>  }
>  
>  void intel_display_rpm_put_unchecked(struct intel_display *display)
>  {
> -	intel_runtime_pm_put_unchecked(display_to_rpm(display));
> +	display->parent->rpm->put_unchecked(display->drm);
>  }
>  
>  bool intel_display_rpm_suspended(struct intel_display *display)
>  {
> -	return intel_runtime_pm_suspended(display_to_rpm(display));
> +	return display->parent->rpm->suspended(display->drm);
>  }
>  
>  void assert_display_rpm_held(struct intel_display *display)
>  {
> -	assert_rpm_wakelock_held(display_to_rpm(display));
> +	display->parent->rpm->assert_held(display->drm);
>  }
>  
>  void intel_display_rpm_assert_block(struct intel_display *display)
>  {
> -	disable_rpm_wakeref_asserts(display_to_rpm(display));
> +	display->parent->rpm->assert_block(display->drm);
>  }
>  
>  void intel_display_rpm_assert_unblock(struct intel_display *display)
>  {
> -	enable_rpm_wakeref_asserts(display_to_rpm(display));
> +	display->parent->rpm->assert_unblock(display->drm);
>  }

-- 
Jani Nikula, Intel