From 3722ef141c5c61ca42d8c2da85ffb1fd1a4e07b2 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Fri, 2 Jan 2026 17:12:25 +0100 Subject: [PATCH] ac/spm: fix a crash with the RT counters on GFX10 They are only enabled on GFX10.3+. Fixes: 8bc37d0d198 ("ac/spm: add support for Ray Tracing counters in RGP") Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/common/ac_spm.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/amd/common/ac_spm.c b/src/amd/common/ac_spm.c index 87f742ebb2e..069135c35f5 100644 --- a/src/amd/common/ac_spm.c +++ b/src/amd/common/ac_spm.c @@ -1564,17 +1564,19 @@ ac_spm_get_derived_trace(const struct radeon_info *info, ADD(MEM_UNIT_STALLED_CYCLES, mem_unit_stalled_cycles); ADD(MEM_UNIT_STALLED, mem_unit_stalled); - /* Raytracing group. */ - /* Ray box tests. */ - const double ray_box_tests = OP_RAW(TD_PERF_SEL_RAY_TRACING_BVH4_FP16_BOX_NODE) + - OP_RAW(TD_PERF_SEL_RAY_TRACING_BVH4_FP32_BOX_NODE); + if (info->gfx_level >= GFX10_3) { + /* Raytracing group. */ + /* Ray box tests. */ + const double ray_box_tests = OP_RAW(TD_PERF_SEL_RAY_TRACING_BVH4_FP16_BOX_NODE) + + OP_RAW(TD_PERF_SEL_RAY_TRACING_BVH4_FP32_BOX_NODE); - ADD(RAY_BOX_TESTS, ray_box_tests); + ADD(RAY_BOX_TESTS, ray_box_tests); - /* Ray triangle tests. */ - const double ray_tri_tests = OP_RAW(TD_PERF_SEL_RAY_TRACING_BVH4_TRI_NODE); + /* Ray triangle tests. */ + const double ray_tri_tests = OP_RAW(TD_PERF_SEL_RAY_TRACING_BVH4_TRI_NODE); - ADD(RAY_TRI_TESTS, ray_tri_tests); + ADD(RAY_TRI_TESTS, ray_tri_tests); + } } #undef ADD