Commit 71c625aa authored by Francois Dugast's avatar Francois Dugast Committed by Rodrigo Vivi

drm/xe/uapi: Align on a common way to return arrays (gt)

The uAPI provides queries which return arrays of elements. As of now
the format used in the struct is different depending on which element
is queried. However, aligning on the new common pattern:

    struct drm_xe_query_Xs {
       __u32 num_Xs;
       struct drm_xe_X Xs[];
       ...
    }

... would mean bringing back the name "gts" which is avoided per commit
fca54ba12470 ("drm/xe/uapi: Rename gts to gt_list") so make an exception
for gt and leave gt_list. Also, this change removes "query" in the
name of struct drm_xe_query_gt as it is not returned from the query
IOCTL. There is no functional change.

v2: Leave gt_list (Matt Roper)
Signed-off-by: default avatarFrancois Dugast <francois.dugast@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 4bc9dd98
...@@ -354,7 +354,7 @@ static int query_gt_list(struct xe_device *xe, struct drm_xe_device_query *query ...@@ -354,7 +354,7 @@ static int query_gt_list(struct xe_device *xe, struct drm_xe_device_query *query
{ {
struct xe_gt *gt; struct xe_gt *gt;
size_t size = sizeof(struct drm_xe_query_gt_list) + size_t size = sizeof(struct drm_xe_query_gt_list) +
xe->info.gt_count * sizeof(struct drm_xe_query_gt); xe->info.gt_count * sizeof(struct drm_xe_gt);
struct drm_xe_query_gt_list __user *query_ptr = struct drm_xe_query_gt_list __user *query_ptr =
u64_to_user_ptr(query->data); u64_to_user_ptr(query->data);
struct drm_xe_query_gt_list *gt_list; struct drm_xe_query_gt_list *gt_list;
......
...@@ -357,14 +357,14 @@ struct drm_xe_query_config { ...@@ -357,14 +357,14 @@ struct drm_xe_query_config {
}; };
/** /**
* struct drm_xe_query_gt - describe an individual GT. * struct drm_xe_gt - describe an individual GT.
* *
* To be used with drm_xe_query_gt_list, 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. * existing GT individual descriptions.
* Graphics Technology (GT) is a subset of a GPU/tile that is responsible for * Graphics Technology (GT) is a subset of a GPU/tile that is responsible for
* implementing graphics and/or media operations. * implementing graphics and/or media operations.
*/ */
struct drm_xe_query_gt { struct drm_xe_gt {
#define DRM_XE_QUERY_GT_TYPE_MAIN 0 #define DRM_XE_QUERY_GT_TYPE_MAIN 0
#define DRM_XE_QUERY_GT_TYPE_MEDIA 1 #define DRM_XE_QUERY_GT_TYPE_MEDIA 1
/** @type: GT type: Main or Media */ /** @type: GT type: Main or Media */
...@@ -404,7 +404,7 @@ struct drm_xe_query_gt_list { ...@@ -404,7 +404,7 @@ struct drm_xe_query_gt_list {
/** @pad: MBZ */ /** @pad: MBZ */
__u32 pad; __u32 pad;
/** @gt_list: The GT list returned for this device */ /** @gt_list: The GT list returned for this device */
struct drm_xe_query_gt gt_list[]; struct drm_xe_gt gt_list[];
}; };
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment