[Intel-xe] [PATCH v2 25/50] fixup! drm/xe: Make DRM_XE_DEVICE_QUERY_ENGINES future proof
Francois Dugast
francois.dugast at intel.com
Fri Nov 3 14:34:31 UTC 2023
Fix these doc build issues:
./include/uapi/drm/xe_drm.h:179: warning: Function parameter or member \
'instance' not described in 'drm_xe_query_engine_info'
./include/uapi/drm/xe_drm.h:179: warning: Function parameter or member \
'rsvd' not described in 'drm_xe_query_engine_info'
Also s/rsvd/reserved to fully align with other entries.
Signed-off-by: Francois Dugast <francois.dugast at intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
---
drivers/gpu/drm/xe/xe_query.c | 2 +-
include/uapi/drm/xe_drm.h | 15 +++++++++++----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_query.c b/drivers/gpu/drm/xe/xe_query.c
index ec00e6f4f1ca..ad587bc0a0d4 100644
--- a/drivers/gpu/drm/xe/xe_query.c
+++ b/drivers/gpu/drm/xe/xe_query.c
@@ -217,7 +217,7 @@ static int query_engines(struct xe_device *xe,
hwe->logical_instance;
hw_engine_info[i].instance.gt_id = gt->info.id;
hw_engine_info[i].instance.pad = 0;
- memset(hw_engine_info->rsvd, 0, sizeof(hw_engine_info->rsvd));
+ memset(hw_engine_info->reserved, 0, sizeof(hw_engine_info->reserved));
i++;
}
diff --git a/include/uapi/drm/xe_drm.h b/include/uapi/drm/xe_drm.h
index 47fe9d1ccdce..2541f0b6ddf6 100644
--- a/include/uapi/drm/xe_drm.h
+++ b/include/uapi/drm/xe_drm.h
@@ -127,6 +127,10 @@ struct xe_user_extension {
/**
* struct drm_xe_engine_class_instance - instance of an engine class
*
+ * It is returned as part of the @drm_xe_query_engine_info, but it also is
+ * used as the input of engine selection for both @drm_xe_exec_queue_create
+ * and @drm_xe_query_engine_cycles
+ *
* The @engine_class can be:
* - %DRM_XE_ENGINE_CLASS_RENDER
* - %DRM_XE_ENGINE_CLASS_COPY
@@ -164,13 +168,16 @@ struct drm_xe_engine_class_instance {
/**
* struct drm_xe_query_engine_info - describe hardware engine
*
- * If a query is made with a struct drm_xe_device_query where .query
- * is equal to DRM_XE_DEVICE_QUERY_ENGINES, then the reply uses an array of
- * struct drm_xe_query_engine_info in .data.
+ * If a query is made with a struct @drm_xe_device_query where .query
+ * is equal to %DRM_XE_DEVICE_QUERY_ENGINES, then the reply uses an array of
+ * struct @drm_xe_query_engine_info in .data.
*/
struct drm_xe_query_engine_info {
+ /** @instance: The @drm_xe_engine_class_instance */
struct drm_xe_engine_class_instance instance;
- __u64 rsvd[3];
+
+ /** @reserved: Reserved */
+ __u64 reserved[3];
};
/**
--
2.34.1
More information about the Intel-xe
mailing list