[Intel-xe] [PATCH 14/17] drm/xe/uapi: Replace useless 'instance' per unique gt_id

[Matthew Brost]

On Tue, Sep 19, 2023 at 10:25:01AM -0400, Rodrigo Vivi wrote:
> Let's have a single GT ID per GT within the PCI Device Card.
> 
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
> Signed-off-by: Francois Dugast <francois.dugast at intel.com>

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

> ---
>  drivers/gpu/drm/xe/xe_gt_types.h | 2 +-
>  drivers/gpu/drm/xe/xe_pci.c      | 4 ----
>  drivers/gpu/drm/xe/xe_query.c    | 2 +-
>  include/uapi/drm/xe_drm.h        | 4 ++--
>  4 files changed, 4 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_gt_types.h b/drivers/gpu/drm/xe/xe_gt_types.h
> index d4310be3e1e7..d3f2793684e2 100644
> --- a/drivers/gpu/drm/xe/xe_gt_types.h
> +++ b/drivers/gpu/drm/xe/xe_gt_types.h
> @@ -105,7 +105,7 @@ struct xe_gt {
>  	struct {
>  		/** @type: type of GT */
>  		enum xe_gt_type type;
> -		/** @id: id of GT */
> +		/** @id: Unique ID of this GT within the PCI Device */
>  		u8 id;
>  		/** @clock_freq: clock frequency */
>  		u32 clock_freq;
> diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
> index dc233a1226bd..c6cd0c7b1082 100644
> --- a/drivers/gpu/drm/xe/xe_pci.c
> +++ b/drivers/gpu/drm/xe/xe_pci.c
> @@ -599,10 +599,6 @@ static int xe_info_init(struct xe_device *xe,
>  			return PTR_ERR(tile->primary_gt);
>  
>  		gt = tile->primary_gt;
> -		/*
> -		 * FIXME: GT numbering scheme may change depending on UAPI
> -		 * decisions.
> -		 */
>  		gt->info.id = xe->info.gt_count++;
>  		gt->info.type = XE_GT_TYPE_MAIN;
>  		gt->info.__engine_mask = graphics_desc->hw_engine_mask;
> diff --git a/drivers/gpu/drm/xe/xe_query.c b/drivers/gpu/drm/xe/xe_query.c
> index be9affd4f181..fb448e76fb0f 100644
> --- a/drivers/gpu/drm/xe/xe_query.c
> +++ b/drivers/gpu/drm/xe/xe_query.c
> @@ -379,7 +379,7 @@ static int query_gts(struct xe_device *xe, struct drm_xe_device_query *query)
>  			gts->gts[id].type = XE_QUERY_GT_TYPE_REMOTE;
>  		else
>  			gts->gts[id].type = XE_QUERY_GT_TYPE_MAIN;
> -		gts->gts[id].instance = id;
> +		gts->gts[id].gt_id = gt->info.id;
>  		gts->gts[id].clock_freq = gt->info.clock_freq;
>  		if (!IS_DGFX(xe))
>  			gts->gts[id].native_mem_regions = 0x1;
> diff --git a/include/uapi/drm/xe_drm.h b/include/uapi/drm/xe_drm.h
> index ad344b3324c6..ca93b43fe3c9 100644
> --- a/include/uapi/drm/xe_drm.h
> +++ b/include/uapi/drm/xe_drm.h
> @@ -350,8 +350,8 @@ struct drm_xe_query_gt {
>  #define XE_QUERY_GT_TYPE_MEDIA		2
>  	/** @type: GT type: Main, Remote, or Media */
>  	__u16 type;
> -	/** @instance: Instance of this GT in the GT list */
> -	__u16 instance;
> +	/** @gt_id: Unique ID of this GT within the PCI Device */
> +	__u16 gt_id;
>  	/** @clock_freq: A clock frequency for timestamp */
>  	__u32 clock_freq;
>  	/** @features: Reserved for future information about GT features */
> -- 
> 2.41.0
>