From: Francois Dugast <francois.dugast@intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [igt-dev] [RFC v1 06/20] drm-uapi/xe: Remove useless query config num_params
Date: Wed, 11 Oct 2023 14:18:27 +0000 [thread overview]
Message-ID: <20231011141841.7-7-francois.dugast@intel.com> (raw)
In-Reply-To: <20231011141841.7-1-francois.dugast@intel.com>
Align with commit ("Remove useless query config num_params")
Signed-off-by: Francois Dugast <francois.dugast@intel.com>
---
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 3eef48f10..7a1b75a60 100644
--- a/include/drm-uapi/xe_drm.h
+++ b/include/drm-uapi/xe_drm.h
@@ -315,9 +315,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;
@@ -355,10 +352,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 986a3a0c1..cd0e29dcc 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 2cff75414..dc19a9d32 100644
--- a/tests/intel/xe_query.c
+++ b/tests/intel/xe_query.c
@@ -359,8 +359,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
next prev parent reply other threads:[~2023-10-11 14:19 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-11 14:18 [igt-dev] [RFC v1 00/20] uAPI Alignment - take 2 Francois Dugast
2023-10-11 14:18 ` [igt-dev] [RFC v1 01/20] drm-uapi/xe: Add documentation for query Francois Dugast
2023-10-11 14:18 ` [igt-dev] [RFC v1 02/20] drm-uapi/xe: Extend drm_xe_vm_bind_op Francois Dugast
2023-10-11 14:18 ` [igt-dev] [RFC v1 03/20] drm-uapi/xe: Add uAPI to query micro-controler firmware version Francois Dugast
2023-10-11 14:18 ` [igt-dev] [RFC v1 04/20] drm-uapi/xe: Document DRM_XE_DEVICE_QUERY_HWCONFIG Francois Dugast
2023-10-11 14:18 ` [igt-dev] [RFC v1 05/20] drm-uapi/xe: Extend uAPI to query HuC micro-controler firmware version Francois Dugast
2023-10-11 14:18 ` Francois Dugast [this message]
2023-10-11 14:18 ` [igt-dev] [RFC v1 07/20] drm-uapi/xe: Add missing DRM_ prefix in uAPI constants Francois Dugast
2023-10-11 14:18 ` [igt-dev] [RFC v1 08/20] drm-uapi/xe: Add _FLAG to uAPI constants usable for flags Francois Dugast
2023-10-11 14:18 ` [igt-dev] [RFC v1 09/20] drm-uapi/xe: Make constant comments visible in kernel doc Francois Dugast
2023-10-11 14:18 ` [igt-dev] [RFC v1 10/20] fixup! tests/intel/xe_query: Add a test for querying engine cycles Francois Dugast
2023-10-11 14:18 ` [igt-dev] [RFC v1 11/20] drm-uapi/xe: Remove GT_TYPE_REMOTE Francois Dugast
2023-10-12 18:36 ` Kamil Konieczny
2023-10-11 14:18 ` [igt-dev] [RFC v1 12/20] drm-uapi/xe: Kill VM_MADVISE IOCTL and the atomic tests Francois Dugast
2023-10-11 14:18 ` [igt-dev] [RFC v1 13/20] drm/xe_query: Remove backward compatibility of vram_visible_size Francois Dugast
2023-10-12 18:39 ` Kamil Konieczny
2023-10-11 14:18 ` [igt-dev] [RFC v1 14/20] xe_ioctl: Converge bo_create to the most used version Francois Dugast
2023-10-11 14:18 ` [igt-dev] [RFC v1 15/20] xe_ioctl: Rename *xe_bo_create_flags to simply xe_bo_create Francois Dugast
2023-10-11 14:18 ` [igt-dev] [RFC v1 16/20] xe_query: Add missing include Francois Dugast
2023-10-12 18:44 ` Kamil Konieczny
2023-10-11 14:18 ` [igt-dev] [RFC v1 17/20] xe_query: Kill visible_vram_if_possible Francois Dugast
2023-10-12 18:46 ` Kamil Konieczny
2023-10-11 14:18 ` [igt-dev] [RFC v1 18/20] drm-uapi/xe: Separate bo_create placement from flags Francois Dugast
2023-10-11 14:18 ` [igt-dev] [RFC v1 19/20] drm-uapi/xe: Align with GuC version type update Francois Dugast
2023-10-11 14:18 ` [igt-dev] [RFC v1 20/20] drm-uapi/xe: Remove unused inaccessible memory region Francois Dugast
2023-10-12 0:20 ` [igt-dev] ✗ Fi.CI.BUILD: failure for uAPI Alignment - take 2 Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231011141841.7-7-francois.dugast@intel.com \
--to=francois.dugast@intel.com \
--cc=igt-dev@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox