fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-23 23:48:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi: fix sqtt setup

Browse source 
Delay sqtt init until all states/funcs have been set.
Also num_contexts is initialized at the end of si_create_context
so use num_contexts == 0 to test if this is the first context.

Fixes: b2db3e1ddc ("radeonsi: add si_gfx_context.c and move code from si_pipe.c")
Reviewed-by: Yogesh Mohan Marimuthu <yogesh.mohanmarimuthu@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41474>
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2026-05-11 10:36:21 +02:00
parent 992b35704e
commit 03f82aaf46
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/gallium/drivers/radeonsi/gfx/si_gfx_context.c
View file

@ -92,24 +92,6 @@ bool si_init_gfx_context(struct si_screen *sscreen, struct si_context *sctx, uns
if (!sscreen->has_gfx_compute)
return false;
if (sscreen->info.gfx_level >= GFX9 && sscreen->debug_flags & DBG(SQTT)) {
/* Auto-enable stable performance profile if possible. */
if (sscreen->b.num_contexts == 1)
ws->cs_set_pstate(&sctx->gfx_cs, RADEON_CTX_PSTATE_PEAK);
if (ac_check_profile_state(&sscreen->info)) {
mesa_loge("Canceling RGP trace request as a hang condition has been "
"detected. Force the GPU into a profiling mode with e.g. "
"\"echo profile_peak > "
"/sys/class/drm/card0/device/power_dpm_force_performance_level\"");
} else {
if (!si_init_sqtt(sctx))
return false;
si_handle_sqtt(sctx, &sctx->gfx_cs);
}
}
sctx->is_gfx_queue = sscreen->info.gfx_level == GFX6 ||
/* Compute queues hang on Raven and derivatives, see:
* https://gitlab.freedesktop.org/mesa/mesa/-/issues/12310 */
@ -308,6 +290,24 @@ bool si_init_gfx_context(struct si_screen *sscreen, struct si_context *sctx, uns
sctx->shader.gs.key.ge.opt.prefer_mono = 1;
}
if (sscreen->info.gfx_level >= GFX9 && sscreen->debug_flags & DBG(SQTT)) {
/* Auto-enable stable performance profile if possible. */
if (sscreen->b.num_contexts == 0)
ws->cs_set_pstate(&sctx->gfx_cs, RADEON_CTX_PSTATE_PEAK);
if (ac_check_profile_state(&sscreen->info)) {
mesa_loge("Canceling RGP trace request as a hang condition has been "
"detected. Force the GPU into a profiling mode with e.g. "
"\"echo profile_peak > "
"/sys/class/drm/card0/device/power_dpm_force_performance_level\"");
} else {
if (!si_init_sqtt(sctx))
return false;
si_handle_sqtt(sctx, &sctx->gfx_cs);
}
}
si_utrace_init(sctx);
si_begin_new_gfx_cs(sctx, true);