On Wed, May 29, 2024 at 08:48:11PM +0300, Jani Nikula wrote:
> Move things that belong to intel_uncore.h to the correct place.
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> ---
> drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 5 -----
> drivers/gpu/drm/xe/compat-i915-headers/intel_uncore.h | 5 +++++
> 2 files 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 7b3f53427b03..60544633ddf7 100644
> --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
> +++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
> @@ -155,11 +155,6 @@ static inline void intel_runtime_pm_put(struct xe_runtime_pm *pm, intel_wakeref_
> #define assert_rpm_wakelock_held(x) do { } while (0)
> #define assert_rpm_raw_wakeref_held(x) do { } while (0)
>
> -#define intel_uncore_forcewake_get(x, y) do { } while (0)
> -#define intel_uncore_forcewake_put(x, y) do { } while (0)
> -
> -#define intel_uncore_arm_unclaimed_mmio_detection(x) do { } while (0)
> -
> #define I915_PRIORITY_DISPLAY 0
> struct i915_sched_attr {
> int priority;
> diff --git a/drivers/gpu/drm/xe/compat-i915-headers/intel_uncore.h b/drivers/gpu/drm/xe/compat-i915-headers/intel_uncore.h
> index ef79793caa72..083c4da2ea41 100644
> --- a/drivers/gpu/drm/xe/compat-i915-headers/intel_uncore.h
> +++ b/drivers/gpu/drm/xe/compat-i915-headers/intel_uncore.h
> @@ -172,4 +172,9 @@ static inline void __iomem *intel_uncore_regs(struct intel_uncore *uncore)
> #define raw_reg_write(base, reg, value) \
> writel(value, base + i915_mmio_reg_offset(reg))
>
> +#define intel_uncore_forcewake_get(x, y) do { } while (0)
> +#define intel_uncore_forcewake_put(x, y) do { } while (0)
> +
> +#define intel_uncore_arm_unclaimed_mmio_detection(x) do { } while (0)
> +
> #endif /* __INTEL_UNCORE_H__ */
> --
> 2.39.2
>
