From 9aa25a340c37329bca897d9f051a5a149efbf903 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Wed, 12 Aug 2020 15:00:34 +0200 Subject: [PATCH] anv: don't fail userspace relocation with perf queries This is a left over from the earlier version of VK_KHR_performance_query where we used kernel relocs to implement multi passe queries. We're using self modifying batches now so we shouldn't need any relocation. Signed-off-by: Lionel Landwerlin Fixes: 2001a80d4a81f2 ("anv: Implement VK_KHR_performance_query") Reviewed-by: Dave Airlie Part-of: (cherry picked from commit 031f9e17d2c387a64770246c2e5801a233a8ea3c) --- .pick_status.json | 2 +- src/intel/vulkan/anv_batch_chain.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 4d911d08f20..8f2c628b5b2 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1246,7 +1246,7 @@ "description": "anv: don't fail userspace relocation with perf queries", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "2001a80d4a81f2e8194b29cca301dd1b27be9acb" }, diff --git a/src/intel/vulkan/anv_batch_chain.c b/src/intel/vulkan/anv_batch_chain.c index d6311a66fa4..589738dad1f 100644 --- a/src/intel/vulkan/anv_batch_chain.c +++ b/src/intel/vulkan/anv_batch_chain.c @@ -1377,9 +1377,6 @@ static bool relocate_cmd_buffer(struct anv_cmd_buffer *cmd_buffer, struct anv_execbuf *exec) { - if (cmd_buffer->perf_query_pool) - return false; - if (!exec->has_relocs) return true;