[PATCH v1 14/14] drm/xe/uapi: Move DRM_XE_ACC_GRANULARITY_* where they are used

[Rodrigo Vivi]

On Thu, Dec 07, 2023 at 01:50:09PM +0000, Francois Dugast wrote:
> Bring those defines close to the context where they can be used. Also
> apply indentation as it is done for other subsets of defines.
> 
> Signed-off-by: Francois Dugast <francois.dugast at intel.com>


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

> ---
>  include/uapi/drm/xe_drm.h | 22 ++++++++--------------
>  1 file changed, 8 insertions(+), 14 deletions(-)
> 
> diff --git a/include/uapi/drm/xe_drm.h b/include/uapi/drm/xe_drm.h
> index 7733c5a3659b..0e22b0ceac4d 100644
> --- a/include/uapi/drm/xe_drm.h
> +++ b/include/uapi/drm/xe_drm.h
> @@ -1031,20 +1031,6 @@ struct drm_xe_vm_bind {
>  	__u64 reserved[2];
>  };
>  
> -/* For use with DRM_XE_EXEC_QUEUE_SET_PROPERTY_ACC_GRANULARITY */
> -
> -/* Monitor 128KB contiguous region with 4K sub-granularity */
> -#define DRM_XE_ACC_GRANULARITY_128K 0
> -
> -/* Monitor 2MB contiguous region with 64KB sub-granularity */
> -#define DRM_XE_ACC_GRANULARITY_2M 1
> -
> -/* Monitor 16MB contiguous region with 512KB sub-granularity */
> -#define DRM_XE_ACC_GRANULARITY_16M 2
> -
> -/* Monitor 64MB contiguous region with 2M sub-granularity */
> -#define DRM_XE_ACC_GRANULARITY_64M 3
> -
>  /**
>   * struct drm_xe_exec_queue_create - Input of &DRM_IOCTL_XE_EXEC_QUEUE_CREATE
>   *
> @@ -1077,6 +1063,14 @@ struct drm_xe_exec_queue_create {
>  #define   DRM_XE_EXEC_QUEUE_SET_PROPERTY_ACC_TRIGGER		5
>  #define   DRM_XE_EXEC_QUEUE_SET_PROPERTY_ACC_NOTIFY		6
>  #define   DRM_XE_EXEC_QUEUE_SET_PROPERTY_ACC_GRANULARITY	7
> +/* Monitor 128KB contiguous region with 4K sub-granularity */
> +#define     DRM_XE_ACC_GRANULARITY_128K				0
> +/* Monitor 2MB contiguous region with 64KB sub-granularity */
> +#define     DRM_XE_ACC_GRANULARITY_2M				1
> +/* Monitor 16MB contiguous region with 512KB sub-granularity */
> +#define     DRM_XE_ACC_GRANULARITY_16M				2
> +/* Monitor 64MB contiguous region with 2M sub-granularity */
> +#define     DRM_XE_ACC_GRANULARITY_64M				3
>  
>  	/** @extensions: Pointer to the first extension struct, if any */
>  	__u64 extensions;
> -- 
> 2.34.1
>