Re: [PATCH 6/6] drm/xe/display: Use display parent interface for xe runtime pm

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

On Wed, 22 Oct 2025, Jouni Högander <jouni.hogander@intel.com> wrote:
> Start using display parent interface for xe runtime pm.

Nice, this is a good reason to keep the wrappers in the previous patch.

>
> Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
> ---
>  drivers/gpu/drm/xe/Makefile                 |  2 +-
>  drivers/gpu/drm/xe/display/xe_display_rpm.c | 73 ---------------------
>  2 files changed, 1 insertion(+), 74 deletions(-)
>  delete mode 100644 drivers/gpu/drm/xe/display/xe_display_rpm.c
>
> diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
> index 82c6b3d296769..4559fb770bf75 100644
> --- a/drivers/gpu/drm/xe/Makefile
> +++ b/drivers/gpu/drm/xe/Makefile
> @@ -211,7 +211,6 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \
>  	display/intel_fbdev_fb.o \
>  	display/xe_display.o \
>  	display/xe_display_misc.o \
> -	display/xe_display_rpm.o \
>  	display/xe_display_wa.o \
>  	display/xe_dsb_buffer.o \
>  	display/xe_fb_pin.o \
> @@ -256,6 +255,7 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \
>  	i915-display/intel_display_power.o \
>  	i915-display/intel_display_power_map.o \
>  	i915-display/intel_display_power_well.o \
> +	i915-display/intel_display_rpm.o \
>  	i915-display/intel_display_trace.o \
>  	i915-display/intel_display_wa.o \
>  	i915-display/intel_dkl_phy.o \
> diff --git a/drivers/gpu/drm/xe/display/xe_display_rpm.c b/drivers/gpu/drm/xe/display/xe_display_rpm.c
> deleted file mode 100644
> index 3825376e98ccd..0000000000000
> --- a/drivers/gpu/drm/xe/display/xe_display_rpm.c
> +++ /dev/null
> @@ -1,73 +0,0 @@
> -// SPDX-License-Identifier: MIT
> -/* Copyright © 2025 Intel Corporation */
> -
> -#include "intel_display_core.h"
> -#include "intel_display_rpm.h"
> -#include "xe_device.h"
> -#include "xe_device_types.h"
> -#include "xe_pm.h"
> -
> -static struct xe_device *display_to_xe(struct intel_display *display)
> -{
> -	return to_xe_device(display->drm);
> -}
> -
> -struct ref_tracker *intel_display_rpm_get_raw(struct intel_display *display)
> -{
> -	return intel_display_rpm_get(display);
> -}
> -
> -void intel_display_rpm_put_raw(struct intel_display *display, struct ref_tracker *wakeref)
> -{
> -	intel_display_rpm_put(display, wakeref);
> -}
> -
> -struct ref_tracker *intel_display_rpm_get(struct intel_display *display)
> -{
> -	return xe_pm_runtime_resume_and_get(display_to_xe(display)) ? INTEL_WAKEREF_DEF : NULL;
> -}
> -
> -struct ref_tracker *intel_display_rpm_get_if_in_use(struct intel_display *display)
> -{
> -	return xe_pm_runtime_get_if_in_use(display_to_xe(display)) ? INTEL_WAKEREF_DEF : NULL;
> -}
> -
> -struct ref_tracker *intel_display_rpm_get_noresume(struct intel_display *display)
> -{
> -	xe_pm_runtime_get_noresume(display_to_xe(display));
> -
> -	return INTEL_WAKEREF_DEF;
> -}
> -
> -void intel_display_rpm_put(struct intel_display *display, struct ref_tracker *wakeref)
> -{
> -	if (wakeref)
> -		xe_pm_runtime_put(display_to_xe(display));
> -}
> -
> -void intel_display_rpm_put_unchecked(struct intel_display *display)
> -{
> -	xe_pm_runtime_put(display_to_xe(display));
> -}
> -
> -bool intel_display_rpm_suspended(struct intel_display *display)
> -{
> -	struct xe_device *xe = display_to_xe(display);
> -
> -	return pm_runtime_suspended(xe->drm.dev);
> -}
> -
> -void assert_display_rpm_held(struct intel_display *display)
> -{
> -	/* FIXME */
> -}
> -
> -void intel_display_rpm_assert_block(struct intel_display *display)
> -{
> -	/* FIXME */
> -}
> -
> -void intel_display_rpm_assert_unblock(struct intel_display *display)
> -{
> -	/* FIXME */
> -}

-- 
Jani Nikula, Intel