X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=blobdiff_plain;f=src%2Fintel%2Fvulkan%2Fanv_batch_chain.c;h=acbc07816b18e7c9ef1e056883c2e507d8d7a80d;hp=f820a69ceec5851ecd0f0f230392946d5a3c4587;hb=d0e11231a4fa7c7c4da2b4f9aed47a6000687f18;hpb=2001a80d4a81f2e8194b29cca301dd1b27be9acb

diff --git a/src/intel/vulkan/anv_batch_chain.c b/src/intel/vulkan/anv_batch_chain.c
index f820a69ceec..acbc07816b1 100644
--- a/src/intel/vulkan/anv_batch_chain.c
+++ b/src/intel/vulkan/anv_batch_chain.c
@@ -1774,8 +1774,9 @@ anv_queue_execbuf_locked(struct anv_queue *queue,
       /* Some performance queries just the pipeline statistic HW, no need for
        * OA in that case, so no need to reconfigure.
        */
-      if (query_info->kind == GEN_PERF_QUERY_TYPE_OA ||
-          query_info->kind == GEN_PERF_QUERY_TYPE_RAW) {
+      if (likely((INTEL_DEBUG & DEBUG_NO_OACONFIG) == 0) &&
+          (query_info->kind == GEN_PERF_QUERY_TYPE_OA ||
+           query_info->kind == GEN_PERF_QUERY_TYPE_RAW)) {
          int ret = gen_ioctl(device->perf_fd, I915_PERF_IOCTL_CONFIG,
                              (void *)(uintptr_t) query_info->oa_metrics_set_id);
          if (ret < 0) {