Module: Mesa Branch: main Commit: 4c7486c9aacc331f53a258e63834cbda4a1493f3 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4c7486c9aacc331f53a258e63834cbda4a1493f3
Author: Samuel Pitoiset <samuel.pitoi...@gmail.com> Date: Mon Dec 11 14:51:53 2023 +0100 radv/winsys: replace '<= GFX6' by '== GFX6' GFX6 is the first AMD family supported by RADV. Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26867> --- src/amd/vulkan/si_cmd_buffer.c | 2 +- src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/amd/vulkan/si_cmd_buffer.c b/src/amd/vulkan/si_cmd_buffer.c index f795f020fd0..adcaffa64d6 100644 --- a/src/amd/vulkan/si_cmd_buffer.c +++ b/src/amd/vulkan/si_cmd_buffer.c @@ -117,7 +117,7 @@ radv_emit_compute(struct radv_device *device, struct radeon_cmdbuf *cs) radeon_set_sh_reg(cs, R_00B9F4_COMPUTE_DISPATCH_TUNNEL, 0); } - if (device->physical_device->rad_info.gfx_level <= GFX6) { + if (device->physical_device->rad_info.gfx_level == GFX6) { if (device->border_color_data.bo) { uint64_t bc_va = radv_buffer_get_va(device->border_color_data.bo); radeon_set_config_reg(cs, R_00950C_TA_CS_BC_BASE_ADDR, bc_va >> 8); diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c index 1d116de2ad1..e0b642a7829 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c @@ -325,7 +325,7 @@ get_nop_packet(struct radv_amdgpu_cs *cs) case AMDGPU_HW_IP_COMPUTE: return cs->ws->info.gfx_ib_pad_with_type2 ? PKT2_NOP_PAD : PKT3_NOP_PAD; case AMDGPU_HW_IP_DMA: - return cs->ws->info.gfx_level <= GFX6 ? 0xF0000000 : SDMA_NOP_PAD; + return cs->ws->info.gfx_level == GFX6 ? 0xF0000000 : SDMA_NOP_PAD; case AMDGPU_HW_IP_UVD: case AMDGPU_HW_IP_UVD_ENC: return PKT2_NOP_PAD;
