Module: Mesa Branch: main Commit: e0507ec50b0186ac0a31d0751a93127fe50842e6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e0507ec50b0186ac0a31d0751a93127fe50842e6
Author: Pierre-Eric Pelloux-Prayer <[email protected]> Date: Tue Oct 3 10:24:49 2023 +0200 radeonsi/sqtt: fix emitting SQTT userdata when CAM is needed Based on radv 6caae898dd40a4d986a. Reviewed-by: Marek Olšák <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26774> --- src/gallium/drivers/radeonsi/si_build_pm4.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeonsi/si_build_pm4.h b/src/gallium/drivers/radeonsi/si_build_pm4.h index 2242213d20d..56334250ef1 100644 --- a/src/gallium/drivers/radeonsi/si_build_pm4.h +++ b/src/gallium/drivers/radeonsi/si_build_pm4.h @@ -269,7 +269,9 @@ radeon_set_reg_seq(reg, num, 0, CIK_UCONFIG, PKT3_SET_UCONFIG_REG, 0) #define radeon_set_uconfig_perfctr_reg_seq(reg, num) \ - radeon_set_reg_seq(reg, num, 0, CIK_UCONFIG, PKT3_SET_UCONFIG_REG, sctx->gfx_level >= GFX10) + radeon_set_reg_seq(reg, num, 0, CIK_UCONFIG, PKT3_SET_UCONFIG_REG, \ + sctx->gfx_level >= GFX10 && \ + sctx->ws->cs_get_ip_type(__cs) == AMD_IP_GFX) #define radeon_set_uconfig_reg(reg, value) \ radeon_set_reg(reg, 0, value, CIK_UCONFIG, PKT3_SET_UCONFIG_REG)
