drm/xe/uapi: Remove useless XE_QUERY_CONFIG_NUM_PARAM

num_params can be used to retrieve the size of the info array
for the specific version of the kernel being used.

v2: Also remove XE_QUERY_CONFIG_NUM_PARAM (José Roberto de Souza)

Signed-off-by: Francois Dugast <francois.dugast@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_query.c b/drivers/gpu/drm/xe/xe_query.c
index 10b9878ec95a33d273af5d942f357e1798670258..58fb06a63db2ca6115de3cd26bfa35ae324329dc 100644 (file)
--- a/drivers/gpu/drm/xe/xe_query.c
+++ b/drivers/gpu/drm/xe/xe_query.c
@@ -305,7 +305,7 @@ static int query_memory_usage(struct xe_device *xe,
 
 static int query_config(struct xe_device *xe, struct drm_xe_device_query *query)
 {
-       u32 num_params = XE_QUERY_CONFIG_NUM_PARAM;
+       const u32 num_params = XE_QUERY_CONFIG_MAX_EXEC_QUEUE_PRIORITY + 1;
        size_t size =
                sizeof(struct drm_xe_query_config) + num_params * sizeof(u64);
        struct drm_xe_query_config __user *query_ptr =

diff --git a/include/uapi/drm/xe_drm.h b/include/uapi/drm/xe_drm.h
index 9bd7092a7ea425c289eed2e63986218adf07f1b2..b9a68f8b69f3e074cef51cca2b222dd8ecc22838 100644 (file)
--- a/include/uapi/drm/xe_drm.h
+++ b/include/uapi/drm/xe_drm.h
@@ -329,7 +329,6 @@ struct drm_xe_query_config {
 #define XE_QUERY_CONFIG_GT_COUNT               4
 #define XE_QUERY_CONFIG_MEM_REGION_COUNT       5
 #define XE_QUERY_CONFIG_MAX_EXEC_QUEUE_PRIORITY        6
-#define XE_QUERY_CONFIG_NUM_PARAM              (XE_QUERY_CONFIG_MAX_EXEC_QUEUE_PRIORITY + 1)
        /** @info: array of elements containing the config info */
        __u64 info[];
 };