Re: [PATCH] drm/xe/uapi: Ensure every uapi struct has drm_xe prefix

[Matthew Brost <matthew.brost@intel.com>]

On Wed, Dec 13, 2023 at 03:03:27PM -0500, Rodrigo Vivi wrote:
> To ensure consistency and avoid possible later conflicts,
> let's add drm_xe prefix to xe_user_extension struct.
> 
> Cc: Francois Dugast <francois.dugast@intel.com>
> Suggested-by: Lucas De Marchi <lucas.demarchi@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Reviewed-by: Matthew Brost <matthew.brost@intel.com>

> ---
>  drivers/gpu/drm/xe/xe_exec_queue.c |  2 +-
>  include/uapi/drm/xe_drm.h          | 18 +++++++++---------
>  2 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_exec_queue.c b/drivers/gpu/drm/xe/xe_exec_queue.c
> index 85bc25fe99ed..b67097ffe6fd 100644
> --- a/drivers/gpu/drm/xe/xe_exec_queue.c
> +++ b/drivers/gpu/drm/xe/xe_exec_queue.c
> @@ -453,7 +453,7 @@ static int exec_queue_user_extensions(struct xe_device *xe, struct xe_exec_queue
>  				      u64 extensions, int ext_number, bool create)
>  {
>  	u64 __user *address = u64_to_user_ptr(extensions);
> -	struct xe_user_extension ext;
> +	struct drm_xe_user_extension ext;
>  	int err;
>  	u32 idx;
>  
> diff --git a/include/uapi/drm/xe_drm.h b/include/uapi/drm/xe_drm.h
> index 0895e4d2a981..8fc3f8caecde 100644
> --- a/include/uapi/drm/xe_drm.h
> +++ b/include/uapi/drm/xe_drm.h
> @@ -27,7 +27,7 @@ extern "C" {
>  #define DRM_XE_RESET_FAILED_UEVENT "DEVICE_STATUS"
>  
>  /**
> - * struct xe_user_extension - Base class for defining a chain of extensions
> + * struct drm_xe_user_extension - Base class for defining a chain of extensions
>   *
>   * Many interfaces need to grow over time. In most cases we can simply
>   * extend the struct and have userspace pass in more data. Another option,
> @@ -45,29 +45,29 @@ extern "C" {
>   *
>   * .. code-block:: C
>   *
> - *	struct xe_user_extension ext3 {
> + *	struct drm_xe_user_extension ext3 {
>   *		.next_extension = 0, // end
>   *		.name = ...,
>   *	};
> - *	struct xe_user_extension ext2 {
> + *	struct drm_xe_user_extension ext2 {
>   *		.next_extension = (uintptr_t)&ext3,
>   *		.name = ...,
>   *	};
> - *	struct xe_user_extension ext1 {
> + *	struct drm_xe_user_extension ext1 {
>   *		.next_extension = (uintptr_t)&ext2,
>   *		.name = ...,
>   *	};
>   *
> - * Typically the struct xe_user_extension would be embedded in some uAPI
> + * Typically the struct drm_xe_user_extension would be embedded in some uAPI
>   * struct, and in this case we would feed it the head of the chain(i.e ext1),
>   * which would then apply all of the above extensions.
>   *
>   */
> -struct xe_user_extension {
> +struct drm_xe_user_extension {
>  	/**
>  	 * @next_extension:
>  	 *
> -	 * Pointer to the next struct xe_user_extension, or zero if the end.
> +	 * Pointer to the next struct drm_xe_user_extension, or zero if the end.
>  	 */
>  	__u64 next_extension;
>  
> @@ -78,7 +78,7 @@ struct xe_user_extension {
>  	 *
>  	 * Also note that the name space for this is not global for the whole
>  	 * driver, but rather its scope/meaning is limited to the specific piece
> -	 * of uAPI which has embedded the struct xe_user_extension.
> +	 * of uAPI which has embedded the struct drm_xe_user_extension.
>  	 */
>  	__u32 name;
>  
> @@ -626,7 +626,7 @@ struct drm_xe_gem_mmap_offset {
>  /** struct drm_xe_ext_set_property - XE set property extension */
>  struct drm_xe_ext_set_property {
>  	/** @base: base user extension */
> -	struct xe_user_extension base;
> +	struct drm_xe_user_extension base;
>  
>  	/** @property: property to set */
>  	__u32 property;
> -- 
> 2.43.0
>