From 15d67c309b1eb370cd06b27a8bd0b05c5cfd8d5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Krist=C3=B3f?= Date: Fri, 29 Aug 2025 12:25:07 +0200 Subject: [PATCH] radv/amdgpu: Use correct NOP packets when unchaining a CS GFX6 doesn't support single-dword PKT3 NOP packets, so they shouldn't be used when unchaining a CS. Cc: mesa-stable Part-of: (cherry picked from commit 3056279d096981a119a3e8a020367df1736f80e8) --- .pick_status.json | 2 +- src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 8369dfda65a..5a6d1a3df99 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -8704,7 +8704,7 @@ "description": "radv/amdgpu: Use correct NOP packets when unchaining a CS", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c index 374311e4713..1db8d566fda 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c @@ -571,12 +571,13 @@ radv_amdgpu_cs_unchain(struct radeon_cmdbuf *cs) return; assert(cs->cdw <= cs->max_dw + 4); + const uint32_t nop_packet = get_nop_packet(acs); acs->chained_to = NULL; - cs->buf[cs->cdw - 4] = PKT3_NOP_PAD; - cs->buf[cs->cdw - 3] = PKT3_NOP_PAD; - cs->buf[cs->cdw - 2] = PKT3_NOP_PAD; - cs->buf[cs->cdw - 1] = PKT3_NOP_PAD; + cs->buf[cs->cdw - 4] = nop_packet; + cs->buf[cs->cdw - 3] = nop_packet; + cs->buf[cs->cdw - 2] = nop_packet; + cs->buf[cs->cdw - 1] = nop_packet; } static bool