From 3056279d096981a119a3e8a020367df1736f80e8 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: --- src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c index 8573758631c..24ceb739047 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c @@ -570,12 +570,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