Mesa (main): intel/dev: Use intel_i915_query_alloc in query_topology
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Jul 16 14:29:49 UTC 2021
Module: Mesa
Branch: main
Commit: ba99d2a3288d87245ce9787106b6118595bd4fb4
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ba99d2a3288d87245ce9787106b6118595bd4fb4
Author: Jason Ekstrand <jason at jlekstrand.net>
Date: Wed Jul 7 14:41:20 2021 -0500
intel/dev: Use intel_i915_query_alloc in query_topology
Reviewed-by: Paulo Zanoni <paulo.r.zanoni at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11770>
---
src/intel/dev/intel_device_info.c | 21 ++-------------------
1 file changed, 2 insertions(+), 19 deletions(-)
diff --git a/src/intel/dev/intel_device_info.c b/src/intel/dev/intel_device_info.c
index 156519dffc1..6962c93ff7e 100644
--- a/src/intel/dev/intel_device_info.c
+++ b/src/intel/dev/intel_device_info.c
@@ -1360,26 +1360,9 @@ getparam_topology(struct intel_device_info *devinfo, int fd)
static bool
query_topology(struct intel_device_info *devinfo, int fd)
{
- struct drm_i915_query_item item = {
- .query_id = DRM_I915_QUERY_TOPOLOGY_INFO,
- };
- struct drm_i915_query query = {
- .num_items = 1,
- .items_ptr = (uintptr_t) &item,
- };
-
- if (intel_ioctl(fd, DRM_IOCTL_I915_QUERY, &query))
- return false;
-
- if (item.length < 0)
- return false;
-
struct drm_i915_query_topology_info *topo_info =
- (struct drm_i915_query_topology_info *) calloc(1, item.length);
- item.data_ptr = (uintptr_t) topo_info;
-
- if (intel_ioctl(fd, DRM_IOCTL_I915_QUERY, &query) ||
- item.length <= 0)
+ intel_i915_query_alloc(fd, DRM_I915_QUERY_TOPOLOGY_INFO);
+ if (topo_info == NULL)
return false;
update_from_topology(devinfo, topo_info);
More information about the mesa-commit
mailing list