[Intel-gfx] [PATCH 6/7] drm/i915: move I915_COLOR_UNEVICTABLE to i915_gem_gtt.h

[Rodrigo Vivi]

On Wed, Jan 18, 2023 at 03:15:37PM +0200, Jani Nikula wrote:
> Declutter i915_drv.h.
> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.h     | 2 --
>  drivers/gpu/drm/i915/i915_gem_gtt.h | 2 ++
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index eed552e507dc..d12c7932677a 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -68,8 +68,6 @@ struct drm_i915_clock_gating_funcs;
>  struct vlv_s0ix_state;
>  struct intel_pxp;
>  
> -#define I915_COLOR_UNEVICTABLE (-1) /* a non-vma sharing the address space */
> -
>  #define GEM_QUIRK_PIN_SWIZZLED_PAGES	BIT(0)
>  
>  /* Data Stolen Memory (DSM) aka "i915 stolen memory" */
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h b/drivers/gpu/drm/i915/i915_gem_gtt.h

same question here... used in gem_evict which does not directly include this

> index 243419783052..3d77679bf211 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.h
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
> @@ -18,6 +18,8 @@ struct drm_i915_gem_object;
>  struct i915_address_space;
>  struct i915_gem_ww_ctx;
>  
> +#define I915_COLOR_UNEVICTABLE (-1) /* a non-vma sharing the address space */
> +
>  int __must_check i915_gem_gtt_prepare_pages(struct drm_i915_gem_object *obj,
>  					    struct sg_table *pages);
>  void i915_gem_gtt_finish_pages(struct drm_i915_gem_object *obj,
> -- 
> 2.34.1
>