From 55fdb21e73bc4f63d622133794bfb82fd10e0bf3 Mon Sep 17 00:00:00 2001 From: Francisco Jerez Date: Tue, 26 Oct 2021 17:18:58 -0700 Subject: [PATCH] intel/dev: Read geometry topology with PRELIM_DRM_I915_QUERY_GEOMETRY_SLICES Tracked-On: OAM-112578 --- src/intel/dev/intel_device_info.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/intel/dev/intel_device_info.c b/src/intel/dev/intel_device_info.c index 8f57c537ecf..41200006f97 100644 --- a/src/intel/dev/intel_device_info.c +++ b/src/intel/dev/intel_device_info.c @@ -1594,10 +1594,15 @@ query_topology(struct intel_device_info *devinfo, int fd) if (devinfo->verx10 >= 125) { struct drm_i915_query_topology_info *geom_topo_info = - intel_i915_query_alloc(fd, DRM_I915_QUERY_GEOMETRY_SUBSLICES, NULL); + intel_i915_query_alloc(fd, PRELIM_DRM_I915_QUERY_GEOMETRY_SLICES, + NULL); if (geom_topo_info == NULL) { - free(topo_info); - return false; + geom_topo_info = + intel_i915_query_alloc(fd, DRM_I915_QUERY_GEOMETRY_SUBSLICES, NULL); + if (geom_topo_info == NULL) { + free(topo_info); + return false; + } } update_from_single_slice_topology(devinfo, topo_info, geom_topo_info);