diff --git a/src/intel/dev/i915/intel_device_info.c b/src/intel/dev/i915/intel_device_info.c
index a832d0bb81a..429e4ad8af8 100644
--- a/src/intel/dev/i915/intel_device_info.c
+++ b/src/intel/dev/i915/intel_device_info.c
@@ -554,14 +554,6 @@ bool intel_device_info_i915_get_info_from_fd(int fd, struct intel_device_info *d
    void *hwconfig_blob;
    int32_t len;
 
-   hwconfig_blob = intel_device_info_i915_query_hwconfig(fd, &len);
-   if (hwconfig_blob) {
-      if (intel_hwconfig_process_table(devinfo, hwconfig_blob, len))
-         intel_device_info_update_after_hwconfig(devinfo);
-
-      free(hwconfig_blob);
-   }
-
    int val;
    if (getparam(fd, I915_PARAM_CS_TIMESTAMP_FREQUENCY, &val))
       devinfo->timestamp_frequency = val;
@@ -585,6 +577,14 @@ bool intel_device_info_i915_get_info_from_fd(int fd, struct intel_device_info *d
       getparam_topology(devinfo, fd);
    }
 
+   hwconfig_blob = intel_device_info_i915_query_hwconfig(fd, &len);
+   if (hwconfig_blob) {
+      if (intel_hwconfig_process_table(devinfo, hwconfig_blob, len))
+         intel_device_info_update_after_hwconfig(devinfo);
+
+      free(hwconfig_blob);
+   }
+
    intel_device_info_i915_query_regions(devinfo, fd, false);
 
    if (devinfo->platform == INTEL_PLATFORM_CHV)
diff --git a/src/intel/dev/xe/intel_device_info.c b/src/intel/dev/xe/intel_device_info.c
index 2740156494c..6cf9d3320c5 100644
--- a/src/intel/dev/xe/intel_device_info.c
+++ b/src/intel/dev/xe/intel_device_info.c
@@ -330,12 +330,12 @@ intel_device_info_xe_get_info_from_fd(int fd, struct intel_device_info *devinfo)
    if (!xe_query_gts(fd, devinfo))
       return false;
 
-   if (xe_query_process_hwconfig(fd, devinfo))
-      intel_device_info_update_after_hwconfig(devinfo);
-
    if (!xe_query_topology(fd, devinfo))
          return false;
 
+   if (xe_query_process_hwconfig(fd, devinfo))
+      intel_device_info_update_after_hwconfig(devinfo);
+
    devinfo->has_context_isolation = true;
    devinfo->has_mmap_offset = true;
    devinfo->has_caching_uapi = false;