Module: Mesa Branch: staging/22.3 Commit: d805e74833ca5a77acaea02b4525f39b7b29fe18 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d805e74833ca5a77acaea02b4525f39b7b29fe18
Author: Danylo Piliaiev <[email protected]> Date: Mon Feb 6 14:56:35 2023 +0100 tu: Prevent using stale value of GRAS_SC_CNTL in sysmem clear cc: mesa-stable Signed-off-by: Danylo Piliaiev <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21148> (cherry picked from commit 388e4ea7333972251dbe8ce91d15ad4001589f35) --- .pick_status.json | 2 +- src/freedreno/vulkan/tu_clear_blit.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 8960128559c..40b1f7b1049 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -355,7 +355,7 @@ "description": "tu: Prevent using stale value of GRAS_SC_CNTL in sysmem clear", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/freedreno/vulkan/tu_clear_blit.c b/src/freedreno/vulkan/tu_clear_blit.c index 46b53429294..ae462d86777 100644 --- a/src/freedreno/vulkan/tu_clear_blit.c +++ b/src/freedreno/vulkan/tu_clear_blit.c @@ -2551,6 +2551,8 @@ tu_clear_sysmem_attachments(struct tu_cmd_buffer *cmd, tu_cs_emit_regs(cs, A6XX_RB_STENCILWRMASK(.wrmask = 0xff)); tu_cs_emit_regs(cs, A6XX_RB_STENCILREF(.ref = s_clear_val)); + tu_cs_emit_regs(cs, A6XX_GRAS_SC_CNTL(.ccusinglecachelinesize = 2)); + unsigned num_rts = util_bitcount(clear_rts); tu_cs_emit_pkt7(cs, CP_LOAD_STATE6_FRAG, 3 + 4 * num_rts); tu_cs_emit(cs, CP_LOAD_STATE6_0_DST_OFF(0) |
