From ba99d2a3288d87245ce9787106b6118595bd4fb4 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 7 Jul 2021 14:41:20 -0500 Subject: [PATCH] intel/dev: Use intel_i915_query_alloc in query_topology Reviewed-by: Paulo Zanoni Part-of: --- 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 156519d..6962c93 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); -- 2.7.4