From 0f8d77fc046b8beac49167fc78fb35345b0dfb5b Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Tue, 20 Feb 2024 19:37:56 -0600 Subject: [PATCH] nvk: Invalidate the texture cache before MSAA resolves Fixes: 4bd2ba31fc95 ("nvk: Use meta for MSAA resolves") Part-of: (cherry picked from commit 3b658028ddf2f1775a8698aae5082c2a222282e4) --- .pick_status.json | 2 +- src/nouveau/vulkan/nvk_cmd_draw.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 3f96ec39ffa..d9b04f16b60 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2084,7 +2084,7 @@ "description": "nvk: Invalidate the texture cache before MSAA resolves", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "4bd2ba31fc952a5ef2e5e238752b9a3d0f750f9c", "notes": null diff --git a/src/nouveau/vulkan/nvk_cmd_draw.c b/src/nouveau/vulkan/nvk_cmd_draw.c index 56b16b2e898..d67125806a2 100644 --- a/src/nouveau/vulkan/nvk_cmd_draw.c +++ b/src/nouveau/vulkan/nvk_cmd_draw.c @@ -917,7 +917,9 @@ nvk_CmdEndRendering(VkCommandBuffer commandBuffer) if (need_resolve) { struct nv_push *p = nvk_cmd_buffer_push(cmd, 2); - P_IMMD(p, NV9097, WAIT_FOR_IDLE, 0); + P_IMMD(p, NVA097, INVALIDATE_TEXTURE_DATA_CACHE, { + .lines = LINES_ALL, + }); nvk_meta_resolve_rendering(cmd, &vk_render); }