drm/xe/uapi: Replace useless 'instance' per unique gt_id

Let's have a single GT ID per GT within the PCI Device Card.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Francois Dugast <francois.dugast@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
This commit is contained in:
Rodrigo Vivi 2023-09-20 15:29:34 -04:00
parent 25f656f534
commit 2519450aaa
4 changed files with 4 additions and 8 deletions

View File

@ -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;

View File

@ -593,10 +593,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;

View File

@ -376,7 +376,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;

View File

@ -348,8 +348,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 */