From c5b8590e6d7c5879e547ff7a4bb8ef7512db2e83 Mon Sep 17 00:00:00 2001 From: Tatsuyuki Ishi Date: Sun, 14 Jan 2024 02:49:23 +0900 Subject: [PATCH] radv: never set DISABLE_WR_CONFIRM for CP DMA clears and copies This mirrors the changes in 69ff9c16bbb ("radeonsi: never set DISABLE_WR_CONFIRM for CP DMA clears and copies"). Cc: mesa-stable Suggested-by: Vitaliy Triang3l Kuzmin Reviewed-by: Bas Nieuwenhuizen Part-of: (cherry picked from commit 43fb43ba2cfe673d5b6693bfe93d0331f86817ed) --- .pick_status.json | 2 +- src/amd/vulkan/si_cmd_buffer.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 5627e3f3068..31c0c456851 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -454,7 +454,7 @@ "description": "radv: never set DISABLE_WR_CONFIRM for CP DMA clears and copies", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/amd/vulkan/si_cmd_buffer.c b/src/amd/vulkan/si_cmd_buffer.c index adcaffa64d6..73a8b847a5c 100644 --- a/src/amd/vulkan/si_cmd_buffer.c +++ b/src/amd/vulkan/si_cmd_buffer.c @@ -1606,12 +1606,6 @@ radv_cs_emit_cp_dma(struct radv_device *device, struct radeon_cmdbuf *cs, bool p /* Sync flags. */ if (flags & CP_DMA_SYNC) header |= S_411_CP_SYNC(1); - else { - if (device->physical_device->rad_info.gfx_level >= GFX9) - command |= S_415_DISABLE_WR_CONFIRM_GFX9(1); - else - command |= S_415_DISABLE_WR_CONFIRM_GFX6(1); - } if (flags & CP_DMA_RAW_WAIT) command |= S_415_RAW_WAIT(1);