fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

anv: Add warning about mismatch between query queues

Browse source 
Cc: 24.2 <mesa-stable>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30652>
(cherry picked from commit 0a19d92ca5)
This commit is contained in:
José Roberto de Souza 2024-08-19 11:13:17 -07:00 • committed by Eric Engestrom
parent 706c8a9b45
commit 5e06c9d249
4 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -4534,7 +4534,7 @@
"description": "anv: Add warning about mismatch between query queues",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

4
src/intel/vulkan/anv_batch_chain.c
View file

@ -1332,6 +1332,10 @@ anv_queue_exec_locked(struct anv_queue *queue,
}
}
if (perf_query_pool && device->perf_queue != queue)
debug_warn_once("Mismatch between queue that OA stream was open and "
"queue were query will be executed.");
result =
device->kmd_backend->queue_exec_locked(
queue,

3
src/intel/vulkan/anv_perf.c
View file

@ -92,6 +92,7 @@ void
anv_device_perf_init(struct anv_device *device)
{
device->perf_fd = -1;
device->perf_queue = NULL;
}
static int
@ -117,6 +118,8 @@ anv_device_perf_open(struct anv_device *device, struct anv_queue *queue, uint64_
ret = intel_perf_stream_open(device->physical->perf, device->fd,
context_or_exec_queue_id, metric_id,
period_exponent, true, true);
if (ret >= 0)
device->perf_queue = queue;
return ret;
}

1
src/intel/vulkan/anv_private.h
View file

@ -1937,6 +1937,7 @@ struct anv_device {
int perf_fd; /* -1 if no opened */
uint64_t perf_metric; /* 0 if unset */
struct anv_queue *perf_queue;
struct intel_aux_map_context *aux_map_ctx;