From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id A60C610E3D7 for ; Tue, 26 Sep 2023 13:01:34 +0000 (UTC) From: Francois Dugast To: igt-dev@lists.freedesktop.org Date: Tue, 26 Sep 2023 13:00:52 +0000 Message-Id: <20230926130054.6-23-francois.dugast@intel.com> In-Reply-To: <20230926130054.6-1-francois.dugast@intel.com> References: <20230926130054.6-1-francois.dugast@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH v3 22/24] drm-uapi/xe: Align with uAPI update for query config num_params List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: Align with commit ("drm/xe: Remove useless query config num_params") Signed-off-by: Francois Dugast --- include/drm-uapi/xe_drm.h | 7 ------- lib/xe/xe_query.c | 2 -- tests/intel/xe_query.c | 2 -- 3 files changed, 11 deletions(-) diff --git a/include/drm-uapi/xe_drm.h b/include/drm-uapi/xe_drm.h index 69b5189ab..94a22b6c8 100644 --- a/include/drm-uapi/xe_drm.h +++ b/include/drm-uapi/xe_drm.h @@ -320,9 +320,6 @@ struct drm_xe_query_mem_usage { * struct drm_xe_query_config in .data. */ struct drm_xe_query_config { - /** @num_params: number of parameters returned in info */ - __u32 num_params; - /** @pad: MBZ */ __u32 pad; @@ -360,10 +357,6 @@ struct drm_xe_query_config { * Value of the highest available exec queue priority */ #define XE_QUERY_CONFIG_MAX_EXEC_QUEUE_PRIORITY 6 - /* - * Number of elements in the info array - */ -#define XE_QUERY_CONFIG_NUM_PARAM (XE_QUERY_CONFIG_MAX_EXEC_QUEUE_PRIORITY + 1) /** @info: array of elements containing the config info */ __u64 info[]; }; diff --git a/lib/xe/xe_query.c b/lib/xe/xe_query.c index 61d71ef26..6feb82ddf 100644 --- a/lib/xe/xe_query.c +++ b/lib/xe/xe_query.c @@ -34,8 +34,6 @@ static struct drm_xe_query_config *xe_query_config_new(int fd) query.data = to_user_pointer(config); igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0); - igt_assert(config->num_params > 0); - return config; } diff --git a/tests/intel/xe_query.c b/tests/intel/xe_query.c index 872b889f9..0dabe8d06 100644 --- a/tests/intel/xe_query.c +++ b/tests/intel/xe_query.c @@ -358,8 +358,6 @@ test_query_config(int fd) query.data = to_user_pointer(config); igt_assert_eq(igt_ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query), 0); - igt_assert(config->num_params > 0); - igt_info("XE_QUERY_CONFIG_REV_AND_DEVICE_ID\t%#llx\n", config->info[XE_QUERY_CONFIG_REV_AND_DEVICE_ID]); igt_info(" REV_ID\t\t\t\t%#llx\n", -- 2.34.1