[Intel-gfx] [PATCH 5/7] drm/i915: move I915_GEM_GPU_DOMAINS to i915_gem.h

[Rodrigo Vivi]

On Wed, Jan 18, 2023 at 03:15:36PM +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 | 7 -------
>  drivers/gpu/drm/i915/i915_gem.h | 7 +++++++
>  2 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 73ce5447cae8..eed552e507dc 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -68,13 +68,6 @@ struct drm_i915_clock_gating_funcs;
>  struct vlv_s0ix_state;
>  struct intel_pxp;
>  
> -#define I915_GEM_GPU_DOMAINS \
> -	(I915_GEM_DOMAIN_RENDER | \
> -	 I915_GEM_DOMAIN_SAMPLER | \
> -	 I915_GEM_DOMAIN_COMMAND | \
> -	 I915_GEM_DOMAIN_INSTRUCTION | \
> -	 I915_GEM_DOMAIN_VERTEX)
> -
>  #define I915_COLOR_UNEVICTABLE (-1) /* a non-vma sharing the address space */
>  
>  #define GEM_QUIRK_PIN_SWIZZLED_PAGES	BIT(0)
> diff --git a/drivers/gpu/drm/i915/i915_gem.h b/drivers/gpu/drm/i915/i915_gem.h
> index a5cdf6662d01..82e9d289398c 100644
> --- a/drivers/gpu/drm/i915/i915_gem.h
> +++ b/drivers/gpu/drm/i915/i915_gem.h
> @@ -39,6 +39,13 @@ struct i915_gem_ww_ctx;
>  struct i915_gtt_view;
>  struct i915_vma;
>  
> +#define I915_GEM_GPU_DOMAINS	       \
> +	(I915_GEM_DOMAIN_RENDER |      \
> +	 I915_GEM_DOMAIN_SAMPLER |     \
> +	 I915_GEM_DOMAIN_COMMAND |     \
> +	 I915_GEM_DOMAIN_INSTRUCTION | \
> +	 I915_GEM_DOMAIN_VERTEX)
> +

this is getting used in i915_vma.c which is not directly importing
the i915_gem.h... should we add this include there explicitly or
rely on the .h indirection include?

>  void i915_gem_init_early(struct drm_i915_private *i915);
>  void i915_gem_cleanup_early(struct drm_i915_private *i915);
>  
> -- 
> 2.34.1
>