Re: [PATCH 6/6] drm/xe/compat: remove intel_runtime_pm.h

[Rodrigo Vivi <rodrigo.vivi@intel.com>]

On Tue, Mar 11, 2025 at 02:05:40PM +0200, Jani Nikula wrote:
> Now that all display code has been converted to display specific runtime
> PM interfaces, there's no need for the compat header anymore.
> 

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  .../gpu/drm/xe/compat-i915-headers/i915_drv.h |  1 -
>  .../xe/compat-i915-headers/intel_runtime_pm.h | 76 -------------------
>  2 files changed, 77 deletions(-)
>  delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_runtime_pm.h
> 
> diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
> index dfec5108d2c3..f89bd5e3520d 100644
> --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
> +++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
> @@ -13,7 +13,6 @@
>  #include <drm/drm_drv.h>
>  
>  #include "i915_utils.h"
> -#include "intel_runtime_pm.h"
>  #include "xe_device.h" /* for xe_device_has_flat_ccs() */
>  #include "xe_device_types.h"
>  
> diff --git a/drivers/gpu/drm/xe/compat-i915-headers/intel_runtime_pm.h b/drivers/gpu/drm/xe/compat-i915-headers/intel_runtime_pm.h
> deleted file mode 100644
> index 274042bff1be..000000000000
> --- a/drivers/gpu/drm/xe/compat-i915-headers/intel_runtime_pm.h
> +++ /dev/null
> @@ -1,76 +0,0 @@
> -/* SPDX-License-Identifier: MIT */
> -/*
> - * Copyright © 2023 Intel Corporation
> - */
> -
> -#ifndef __INTEL_RUNTIME_PM_H__
> -#define __INTEL_RUNTIME_PM_H__
> -
> -#include "intel_wakeref.h"
> -#include "xe_device_types.h"
> -#include "xe_pm.h"
> -
> -#define intel_runtime_pm xe_runtime_pm
> -
> -static inline void disable_rpm_wakeref_asserts(void *rpm)
> -{
> -}
> -
> -static inline void enable_rpm_wakeref_asserts(void *rpm)
> -{
> -}
> -
> -static inline bool
> -intel_runtime_pm_suspended(struct xe_runtime_pm *pm)
> -{
> -	struct xe_device *xe = container_of(pm, struct xe_device, runtime_pm);
> -
> -	return pm_runtime_suspended(xe->drm.dev);
> -}
> -
> -static inline intel_wakeref_t intel_runtime_pm_get(struct xe_runtime_pm *pm)
> -{
> -	struct xe_device *xe = container_of(pm, struct xe_device, runtime_pm);
> -
> -	return xe_pm_runtime_resume_and_get(xe) ? INTEL_WAKEREF_DEF : NULL;
> -}
> -
> -static inline intel_wakeref_t intel_runtime_pm_get_if_in_use(struct xe_runtime_pm *pm)
> -{
> -	struct xe_device *xe = container_of(pm, struct xe_device, runtime_pm);
> -
> -	return xe_pm_runtime_get_if_in_use(xe) ? INTEL_WAKEREF_DEF : NULL;
> -}
> -
> -static inline intel_wakeref_t intel_runtime_pm_get_noresume(struct xe_runtime_pm *pm)
> -{
> -	struct xe_device *xe = container_of(pm, struct xe_device, runtime_pm);
> -
> -	xe_pm_runtime_get_noresume(xe);
> -
> -	return INTEL_WAKEREF_DEF;
> -}
> -
> -static inline void intel_runtime_pm_put_unchecked(struct xe_runtime_pm *pm)
> -{
> -	struct xe_device *xe = container_of(pm, struct xe_device, runtime_pm);
> -
> -	xe_pm_runtime_put(xe);
> -}
> -
> -static inline void intel_runtime_pm_put(struct xe_runtime_pm *pm, intel_wakeref_t wakeref)
> -{
> -	if (wakeref)
> -		intel_runtime_pm_put_unchecked(pm);
> -}
> -
> -#define intel_runtime_pm_get_raw intel_runtime_pm_get
> -#define intel_runtime_pm_put_raw intel_runtime_pm_put
> -#define assert_rpm_wakelock_held(x) do { } while (0)
> -#define assert_rpm_raw_wakeref_held(x) do { } while (0)
> -
> -#define with_intel_runtime_pm(rpm, wf) \
> -	for ((wf) = intel_runtime_pm_get(rpm); (wf); \
> -	     intel_runtime_pm_put((rpm), (wf)), (wf) = NULL)
> -
> -#endif
> -- 
> 2.39.5
>