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

radeonsi: inhibit clockgating when using SQTT

Browse source 
Ported from PAL.

Fixes: 07c1504d1b ("radeonsi: implement SQTT support")
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8480>
(cherry picked from commit 41d22eb68e)
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2021-01-13 21:20:42 +01:00 • committed by Dylan Baker
parent 3994f5db48
commit 24b733aebd
4 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -85,7 +85,7 @@
"description": "radeonsi: inhibit clockgating when using SQTT",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "07c1504d1b08d4f61aeada7364d63e26d05d05f9"
},

14
src/gallium/drivers/radeonsi/si_perfcounter.c
View file

@ -919,14 +919,14 @@ static void si_pc_query_destroy(struct si_context *sctx, struct si_query *squery
FREE(query);
}
static void si_inhibit_clockgating(struct si_context *sctx, bool inhibit)
void si_inhibit_clockgating(struct si_context *sctx, struct radeon_cmdbuf *cs, bool inhibit)
{
if (sctx->chip_class >= GFX10) {
radeon_set_uconfig_reg(&sctx->gfx_cs, R_037390_RLC_PERFMON_CLK_CNTL,
S_037390_PERFMON_CLOCK_STATE(inhibit));
radeon_set_uconfig_reg(cs, R_037390_RLC_PERFMON_CLK_CNTL,
S_037390_PERFMON_CLOCK_STATE(inhibit));
} else if (sctx->chip_class >= GFX8) {
radeon_set_uconfig_reg(&sctx->gfx_cs, R_0372FC_RLC_PERFMON_CLK_CNTL,
S_0372FC_PERFMON_CLOCK_STATE(inhibit));
radeon_set_uconfig_reg(cs, R_0372FC_RLC_PERFMON_CLK_CNTL,
S_0372FC_PERFMON_CLOCK_STATE(inhibit));
}
}
@ -946,7 +946,7 @@ static void si_pc_query_resume(struct si_context *sctx, struct si_query *squery)
if (query->shaders)
si_pc_emit_shaders(sctx, query->shaders);
si_inhibit_clockgating(sctx, true);
si_inhibit_clockgating(sctx, &sctx->gfx_cs, true);
for (struct si_query_group *group = query->groups; group; group = group->next) {
struct si_pc_block *block = group->block;
@ -1000,7 +1000,7 @@ static void si_pc_query_suspend(struct si_context *sctx, struct si_query *squery
si_pc_emit_instance(sctx, -1, -1);
si_inhibit_clockgating(sctx, false);
si_inhibit_clockgating(sctx, &sctx->gfx_cs, false);
}
static bool si_pc_query_begin(struct si_context *ctx, struct si_query *squery)

1
src/gallium/drivers/radeonsi/si_pipe.h
View file

@ -1491,6 +1491,7 @@ void si_init_compiler(struct si_screen *sscreen, struct ac_llvm_compiler *compil
/* si_perfcounters.c */
void si_init_perfcounters(struct si_screen *screen);
void si_destroy_perfcounters(struct si_screen *screen);
void si_inhibit_clockgating(struct si_context *sctx, struct radeon_cmdbuf *cs, bool inhibit);
/* si_query.c */
void si_init_screen_query_functions(struct si_screen *sscreen);

4
src/gallium/drivers/radeonsi/si_sqtt.c
View file

@ -378,6 +378,8 @@ si_thread_trace_start(struct si_context *sctx, int family, struct radeon_cmdbuf
SI_CONTEXT_INV_L2;
sctx->emit_cache_flush(sctx, cs);
si_inhibit_clockgating(sctx, cs, true);
/* Enable SQG events that collects thread trace data. */
si_emit_spi_config_cntl(sctx, cs, true);
@ -418,6 +420,8 @@ si_thread_trace_stop(struct si_context *sctx, int family, struct radeon_cmdbuf *
/* Restore previous state by disabling SQG events. */
si_emit_spi_config_cntl(sctx, cs, false);
si_inhibit_clockgating(sctx, cs, false);
}