drm/xe/uapi: Rename gts to gt_list

During the uapi review it was identified a possible confusion
with the plural of acronym with a new acronym. So the
recommendation is to go with gt_list instead.

Suggested-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Francois Dugast <francois.dugast@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_query.c b/drivers/gpu/drm/xe/xe_query.c
index 3bff06299e652ecbb243b39ebb1a59684e002323..d37c75a0b02867f17620db5d6a3ae3302d7d0a86 100644 (file)
--- a/drivers/gpu/drm/xe/xe_query.c
+++ b/drivers/gpu/drm/xe/xe_query.c
@@ -347,14 +347,14 @@ static int query_config(struct xe_device *xe, struct drm_xe_device_query *query)
        return 0;
 }
 
-static int query_gts(struct xe_device *xe, struct drm_xe_device_query *query)
+static int query_gt_list(struct xe_device *xe, struct drm_xe_device_query *query)
 {
        struct xe_gt *gt;
-       size_t size = sizeof(struct drm_xe_query_gts) +
+       size_t size = sizeof(struct drm_xe_query_gt_list) +
                xe->info.gt_count * sizeof(struct drm_xe_query_gt);
-       struct drm_xe_query_gts __user *query_ptr =
+       struct drm_xe_query_gt_list __user *query_ptr =
                u64_to_user_ptr(query->data);
-       struct drm_xe_query_gts *gts;
+       struct drm_xe_query_gt_list *gt_list;
        u8 id;
 
        if (query->size == 0) {
@@ -364,34 +364,34 @@ static int query_gts(struct xe_device *xe, struct drm_xe_device_query *query)
                return -EINVAL;
        }
 
-       gts = kzalloc(size, GFP_KERNEL);
-       if (!gts)
+       gt_list = kzalloc(size, GFP_KERNEL);
+       if (!gt_list)
                return -ENOMEM;
 
-       gts->num_gt = xe->info.gt_count;
+       gt_list->num_gt = xe->info.gt_count;
        for_each_gt(gt, xe, id) {
                if (xe_gt_is_media_type(gt))
-                       gts->gts[id].type = XE_QUERY_GT_TYPE_MEDIA;
+                       gt_list->gt_list[id].type = XE_QUERY_GT_TYPE_MEDIA;
                else if (gt_to_tile(gt)->id > 0)
-                       gts->gts[id].type = XE_QUERY_GT_TYPE_REMOTE;
+                       gt_list->gt_list[id].type = XE_QUERY_GT_TYPE_REMOTE;
                else
-                       gts->gts[id].type = XE_QUERY_GT_TYPE_MAIN;
-               gts->gts[id].gt_id = gt->info.id;
-               gts->gts[id].clock_freq = gt->info.clock_freq;
+                       gt_list->gt_list[id].type = XE_QUERY_GT_TYPE_MAIN;
+               gt_list->gt_list[id].gt_id = gt->info.id;
+               gt_list->gt_list[id].clock_freq = gt->info.clock_freq;
                if (!IS_DGFX(xe))
-                       gts->gts[id].native_mem_regions = 0x1;
+                       gt_list->gt_list[id].native_mem_regions = 0x1;
                else
-                       gts->gts[id].native_mem_regions =
+                       gt_list->gt_list[id].native_mem_regions =
                                BIT(gt_to_tile(gt)->id) << 1;
-               gts->gts[id].slow_mem_regions = xe->info.mem_region_mask ^
-                       gts->gts[id].native_mem_regions;
+               gt_list->gt_list[id].slow_mem_regions = xe->info.mem_region_mask ^
+                       gt_list->gt_list[id].native_mem_regions;
        }
 
-       if (copy_to_user(query_ptr, gts, size)) {
-               kfree(gts);
+       if (copy_to_user(query_ptr, gt_list, size)) {
+               kfree(gt_list);
                return -EFAULT;
        }
-       kfree(gts);
+       kfree(gt_list);
 
        return 0;
 }
@@ -503,7 +503,7 @@ static int (* const xe_query_funcs[])(struct xe_device *xe,
        query_engines,
        query_memory_usage,
        query_config,
-       query_gts,
+       query_gt_list,
        query_hwconfig,
        query_gt_topology,
        query_engine_cycles,

diff --git a/include/uapi/drm/xe_drm.h b/include/uapi/drm/xe_drm.h
index 538873361d17f7dba7ac140c38313e18bc92d33f..b02a6327097223de0b752d1dc8c28bed38120fe5 100644 (file)
--- a/include/uapi/drm/xe_drm.h
+++ b/include/uapi/drm/xe_drm.h
@@ -337,7 +337,7 @@ struct drm_xe_query_config {
 /**
  * struct drm_xe_query_gt - describe an individual GT.
  *
- * To be used with drm_xe_query_gts, which will return a list with all the
+ * To be used with drm_xe_query_gt_list, which will return a list with all the
  * existing GT individual descriptions.
  * Graphics Technology (GT) is a subset of a GPU/tile that is responsible for
  * implementing graphics and/or media operations.
@@ -374,19 +374,19 @@ struct drm_xe_query_gt {
 };
 
 /**
- * struct drm_xe_query_gts - describe GTs
+ * struct drm_xe_query_gt_list - A list with GT description items.
  *
  * If a query is made with a struct drm_xe_device_query where .query
- * is equal to DRM_XE_DEVICE_QUERY_GTS, then the reply uses struct
- * drm_xe_query_gts in .data.
+ * is equal to DRM_XE_DEVICE_QUERY_GT_LIST, then the reply uses struct
+ * drm_xe_query_gt_list in .data.
  */
-struct drm_xe_query_gts {
-       /** @num_gt: number of GTs returned in gts */
+struct drm_xe_query_gt_list {
+       /** @num_gt: number of GT items returned in gt_list */
        __u32 num_gt;
        /** @pad: MBZ */
        __u32 pad;
-       /** @gts: The GT list returned for this device */
-       struct drm_xe_query_gt gts[];
+       /** @gt_list: The GT list returned for this device */
+       struct drm_xe_query_gt gt_list[];
 };
 
 /**
@@ -479,7 +479,7 @@ struct drm_xe_device_query {
 #define DRM_XE_DEVICE_QUERY_ENGINES            0
 #define DRM_XE_DEVICE_QUERY_MEM_USAGE          1
 #define DRM_XE_DEVICE_QUERY_CONFIG             2
-#define DRM_XE_DEVICE_QUERY_GTS                        3
+#define DRM_XE_DEVICE_QUERY_GT_LIST            3
 #define DRM_XE_DEVICE_QUERY_HWCONFIG           4
 #define DRM_XE_DEVICE_QUERY_GT_TOPOLOGY                5
 #define DRM_XE_DEVICE_QUERY_ENGINE_CYCLES      6