From: Rhys Perry <pendingchaos02@gmail.com>
Date: Wed, 11 Jan 2023 20:03:08 +0000 (+0000)
Subject: radv/gfx11: increase radeon_check_space for occlusion query begin
X-Git-Tag: upstream/22.3.5~142
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=16c5e743c6913e3e6686f2b8bf5d7b0a4a037a7b;p=platform%2Fupstream%2Fmesa.git

radv/gfx11: increase radeon_check_space for occlusion query begin

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20652>
(cherry picked from commit 9112fe3c76db55ce73ce89e736bd8bc4f8977218)
---

diff --git a/.pick_status.json b/.pick_status.json
index b64a2f7..59d7966 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -6016,7 +6016,7 @@
         "description": "radv/gfx11: increase radeon_check_space for occlusion query begin",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c
index 389e593..157f370 100644
--- a/src/amd/vulkan/radv_query.c
+++ b/src/amd/vulkan/radv_query.c
@@ -1747,7 +1747,7 @@ emit_begin_query(struct radv_cmd_buffer *cmd_buffer, struct radv_query_pool *poo
    struct radeon_cmdbuf *cs = cmd_buffer->cs;
    switch (query_type) {
    case VK_QUERY_TYPE_OCCLUSION:
-      radeon_check_space(cmd_buffer->device->ws, cs, 7);
+      radeon_check_space(cmd_buffer->device->ws, cs, 11);
 
       ++cmd_buffer->state.active_occlusion_queries;
       if (cmd_buffer->state.active_occlusion_queries == 1) {