diff options
| author | Jonathan Marek <[email protected]> | 2020-02-10 13:51:36 -0500 |
|---|---|---|
| committer | Jonathan Marek <[email protected]> | 2020-02-14 08:22:33 -0500 |
| commit | 75fbe089a6a29b01c2b3425b1c0fc2ee43bc5ff8 (patch) | |
| tree | 00f159e0f6d1081d4e19cfb45dbbbe833ddfa362 /src/freedreno | |
| parent | c57456aab6974abc86e7e1b0aae958a8ab3dad27 (diff) | |
freedreno: name sysmem color/depth flush events
Signed-off-by: Jonathan Marek <[email protected]>
Reviewed-by: Connor Abbott <[email protected]>
Reviewed-by: Rob Clark <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3814>
Diffstat (limited to 'src/freedreno')
| -rw-r--r-- | src/freedreno/registers/adreno_pm4.xml | 5 | ||||
| -rw-r--r-- | src/freedreno/vulkan/tu_blit.c | 8 | ||||
| -rw-r--r-- | src/freedreno/vulkan/tu_cmd_buffer.c | 10 |
3 files changed, 12 insertions, 11 deletions
diff --git a/src/freedreno/registers/adreno_pm4.xml b/src/freedreno/registers/adreno_pm4.xml index c5f3f0a62f3..09ecd0c3349 100644 --- a/src/freedreno/registers/adreno_pm4.xml +++ b/src/freedreno/registers/adreno_pm4.xml @@ -37,8 +37,9 @@ xsi:schemaLocation="http://nouveau.freedesktop.org/ rules-ng.xsd"> <value name="FLUSH_SO_3" value="20" variants="A5XX,A6XX"/> <value name="PC_CCU_INVALIDATE_DEPTH" value="24" variants="A5XX,A6XX"/> <value name="PC_CCU_INVALIDATE_COLOR" value="25" variants="A5XX,A6XX"/> - <value name="UNK_1C" value="28" variants="A5XX,A6XX"/> - <value name="UNK_1D" value="29" variants="A5XX,A6XX"/> + <value name="PC_CCU_RESOLVE_TS" value="26" variants="A6XX"/> + <value name="PC_CCU_FLUSH_DEPTH_TS" value="28" variants="A5XX,A6XX"/> + <value name="PC_CCU_FLUSH_COLOR_TS" value="29" variants="A5XX,A6XX"/> <value name="BLIT" value="30" variants="A5XX,A6XX"/> <value name="UNK_25" value="37" variants="A5XX"/> <value name="LRZ_FLUSH" value="38" variants="A5XX,A6XX"/> diff --git a/src/freedreno/vulkan/tu_blit.c b/src/freedreno/vulkan/tu_blit.c index 9baca8e582f..b71effb62ed 100644 --- a/src/freedreno/vulkan/tu_blit.c +++ b/src/freedreno/vulkan/tu_blit.c @@ -283,8 +283,8 @@ void tu_blit(struct tu_cmd_buffer *cmdbuf, struct tu_cs *cs, tu_cs_reserve_space(cmdbuf->device, cs, 18); tu6_emit_event_write(cmdbuf, cs, LRZ_FLUSH, false); - tu6_emit_event_write(cmdbuf, cs, 0x1d, true); - tu6_emit_event_write(cmdbuf, cs, FACENESS_FLUSH, true); + tu6_emit_event_write(cmdbuf, cs, PC_CCU_FLUSH_COLOR_TS, true); + tu6_emit_event_write(cmdbuf, cs, PC_CCU_FLUSH_DEPTH_TS, true); tu6_emit_event_write(cmdbuf, cs, PC_CCU_INVALIDATE_COLOR, false); tu6_emit_event_write(cmdbuf, cs, PC_CCU_INVALIDATE_DEPTH, false); @@ -367,8 +367,8 @@ void tu_blit(struct tu_cmd_buffer *cmdbuf, struct tu_cs *cs, tu_cs_reserve_space(cmdbuf->device, cs, 17); - tu6_emit_event_write(cmdbuf, cs, 0x1d, true); - tu6_emit_event_write(cmdbuf, cs, FACENESS_FLUSH, true); + tu6_emit_event_write(cmdbuf, cs, PC_CCU_FLUSH_COLOR_TS, true); + tu6_emit_event_write(cmdbuf, cs, PC_CCU_FLUSH_DEPTH_TS, true); tu6_emit_event_write(cmdbuf, cs, CACHE_FLUSH_TS, true); tu6_emit_event_write(cmdbuf, cs, CACHE_INVALIDATE, false); } diff --git a/src/freedreno/vulkan/tu_cmd_buffer.c b/src/freedreno/vulkan/tu_cmd_buffer.c index d54891971eb..4f7eb2b7eb6 100644 --- a/src/freedreno/vulkan/tu_cmd_buffer.c +++ b/src/freedreno/vulkan/tu_cmd_buffer.c @@ -1493,7 +1493,7 @@ tu_cmd_prepare_sysmem_clear_ib(struct tu_cmd_buffer *cmd, * when nothing clears which we currently can't handle. */ tu_cs_reserve_space(cmd->device, &sub_cs, 5); - tu6_emit_event_write(cmd, &sub_cs, UNK_1D, true); + tu6_emit_event_write(cmd, &sub_cs, PC_CCU_FLUSH_COLOR_TS, true); cmd->state.sysmem_clear_ib = tu_cs_end_sub_stream(&cmd->sub_cs, &sub_cs); } @@ -1584,8 +1584,8 @@ tu6_sysmem_render_end(struct tu_cmd_buffer *cmd, struct tu_cs *cs) tu6_emit_lrz_flush(cmd, cs); - tu6_emit_event_write(cmd, cs, UNK_1C, true); - tu6_emit_event_write(cmd, cs, UNK_1D, true); + tu6_emit_event_write(cmd, cs, PC_CCU_FLUSH_COLOR_TS, true); + tu6_emit_event_write(cmd, cs, PC_CCU_FLUSH_DEPTH_TS, true); tu_cs_sanity_check(cs); } @@ -2733,8 +2733,8 @@ tu_CmdNextSubpass(VkCommandBuffer commandBuffer, VkSubpassContents contents) /* Emit flushes so that input attachments will read the correct value. This * is for sysmem only, although it shouldn't do much harm on gmem. */ - tu6_emit_event_write(cmd, cs, UNK_1C, true); - tu6_emit_event_write(cmd, cs, UNK_1D, true); + tu6_emit_event_write(cmd, cs, PC_CCU_FLUSH_COLOR_TS, true); + tu6_emit_event_write(cmd, cs, PC_CCU_FLUSH_DEPTH_TS, true); /* TODO: * since we don't know how to do GMEM->GMEM resolve, |