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: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37121>
(cherry picked from commit 3056279d09)
This commit is contained in:
Timur Kristóf 2025-08-29 12:25:07 +02:00 committed by Eric Engestrom
parent 36ef404a6c
commit 15d67c309b
2 changed files with 6 additions and 5 deletions

View file

@ -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

View file

@ -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