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

tu: Disable features using performance counter for KGSL

Browse source 
KGSL doesn't support reading of performance counters by writing to
the selector registers directly from a userspace CS, instead these
requests need to be routed via the KGSL uAPI for perf counters.

Certain Turnip features which use performance counters such as
KHR_performance_query as well as preempt-optimize mode in autotune
are now explicitly disabled to reflect this.

Signed-off-by: Dhruv Mark Collins <mark@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40852>
This commit is contained in:
Dhruv Mark Collins 2026-04-09 13:19:42 +00:00 • committed by Marge Bot
parent 63d55d84a3
commit 18437c7a65
6 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/freedreno/vulkan/tu_autotune.cc
View file

@ -336,7 +336,8 @@ uint32_t
tu_autotune::get_supported_mod_flags(tu_device *device) const
{
uint32_t supported_mod_flags = (uint32_t) mod_flag::BIG_GMEM | (uint32_t) mod_flag::TUNE_SMALL;
if (device->physical_device->info->props.max_draw_states > TU_DRAW_STATE_AT_WRITE_RP_HASH) {
if (device->physical_device->info->props.max_draw_states > TU_DRAW_STATE_AT_WRITE_RP_HASH &&
device->physical_device->is_perf_cntr_selectable) {
supported_mod_flags |= (uint32_t) mod_flag::PREEMPT_OPTIMIZE;
}
return supported_mod_flags;

2
src/freedreno/vulkan/tu_device.cc
View file

@ -216,7 +216,7 @@ get_device_extensions(const struct tu_physical_device *device,
.KHR_maintenance8 = tu_is_vk_1_1(device),
.KHR_map_memory2 = true,
.KHR_multiview = tu_has_multiview(device),
.KHR_performance_query = TU_DEBUG(PERFC) || TU_DEBUG(PERFCRAW),
.KHR_performance_query = (TU_DEBUG(PERFC) || TU_DEBUG(PERFCRAW)) && device->is_perf_cntr_selectable,
.KHR_pipeline_executable_properties = true,
.KHR_pipeline_library = true,
#ifdef TU_USE_WSI_PLATFORM

3
src/freedreno/vulkan/tu_device.h
View file

@ -142,6 +142,9 @@ struct tu_physical_device
bool has_preemption;
/* Whether performance counter selector registers can be written by userspace CSes. */
bool is_perf_cntr_selectable;
struct {
uint32_t non_lazy_type_count;
uint32_t type_count;

2
src/freedreno/vulkan/tu_knl_drm_msm.cc
View file

@ -1668,6 +1668,8 @@ tu_knl_drm_msm_load(struct tu_instance *instance,
device->has_preemption = tu_drm_has_preemption(device);
device->is_perf_cntr_selectable = true;
/* Even if kernel is new enough, the GPU itself may not support it. */
device->has_cached_coherent_memory =
(device->msm_minor_version >= 8) &&

1
src/freedreno/vulkan/tu_knl_drm_virtio.cc
View file

@ -1339,6 +1339,7 @@ tu_knl_drm_virtio_load(struct tu_instance *instance,
device->has_set_iova = true;
device->has_lazy_bos = true;
device->has_preemption = has_preemption;
device->is_perf_cntr_selectable = true;
device->uche_trap_base = uche_trap_base;
device->ubwc_config.bank_swizzle_levels = bank_swizzle_levels;

3
src/freedreno/vulkan/tu_knl_kgsl.cc
View file

@ -1870,6 +1870,9 @@ tu_knl_kgsl_load(struct tu_instance *instance, int fd)
/* preemption is always supported on kgsl */
device->has_preemption = true;
/* KGSL doesn't allow writing the perf counter selector as the expectation is to use the uAPI provided for this. */
device->is_perf_cntr_selectable = false;
device->ubwc_config.highest_bank_bit = highest_bank_bit;
/* The other config values can be partially inferred from the UBWC version,