[PATCH v4 3/3] drm/xe: Use intel_wakeref_t in intel_runtime_pm functions

Jani Nikula jani.nikula at linux.intel.com
Thu Jan 4 16:58:14 UTC 2024


On Thu, 04 Jan 2024, José Roberto de Souza <jose.souza at intel.com> wrote:
> Now intel_wakeref_t is a unsigned long and Xe KMD version of those
> functions should use the same type, so changing from bool to
> intel_wakeref_t.
>
> Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> Signed-off-by: José Roberto de Souza <jose.souza at intel.com>

I don't think it was ever a bool in i915.

Wish we'd get the ref tracker in xe too.

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


> ---
>  drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> 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 5d2a77b52db41..420eba0e4be00 100644
> --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
> +++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
> @@ -162,18 +162,18 @@ static inline struct drm_i915_private *kdev_to_i915(struct device *kdev)
>  
>  #include "intel_wakeref.h"
>  
> -static inline bool intel_runtime_pm_get(struct xe_runtime_pm *pm)
> +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);
>  
>  	if (xe_pm_runtime_get(xe) < 0) {
>  		xe_pm_runtime_put(xe);
> -		return false;
> +		return 0;
>  	}
> -	return true;
> +	return 1;
>  }
>  
> -static inline bool intel_runtime_pm_get_if_in_use(struct xe_runtime_pm *pm)
> +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);
>  
> @@ -187,7 +187,7 @@ static inline void intel_runtime_pm_put_unchecked(struct xe_runtime_pm *pm)
>  	xe_pm_runtime_put(xe);
>  }
>  
> -static inline void intel_runtime_pm_put(struct xe_runtime_pm *pm, bool wakeref)
> +static inline void intel_runtime_pm_put(struct xe_runtime_pm *pm, intel_wakeref_t wakeref)
>  {
>  	if (wakeref)
>  		intel_runtime_pm_put_unchecked(pm);

-- 
Jani Nikula, Intel


More information about the Intel-xe mailing list