[PATCH v3 06/16] drm/msm: Add a6xx+ perfcntr tables

Rob Clark
2026-05-04T19:08:33Z

Wire up the generated perfcntr tables for a6xx+. The PERFCNTR_CONFIG
ioctl will use this information to assign counters.

Signed-off-by: Rob Clark <robin.clark@oss.qualcomm.com>
---
drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 15 +++++++++++++++
drivers/gpu/drm/msm/msm_gpu.h | 4 ++++
drivers/gpu/drm/msm/msm_perfcntr.h | 9 +++++++++
3 files changed, 28 insertions(+)

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
index e578417a4949..727281fbef36 100644
--- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c
@@ -5,6 +5,7 @@
#include "msm_gem.h"
#include "msm_mmu.h"
#include "msm_gpu_trace.h"
+#include "msm_perfcntr.h"
#include "a6xx_gpu.h"
#include "a6xx_gmu.xml.h"

@@ -2637,6 +2638,20 @@ static struct msm_gpu *a6xx_gpu_init(struct drm_device *dev)
adreno_gpu = &a6xx_gpu->base;
gpu = &adreno_gpu->base;

+ if ((ADRENO_6XX_GEN1 <= config->info->family) &&
+ (config->info->family <= ADRENO_6XX_GEN4)) {
+ gpu->perfcntr_groups = a6xx_perfcntr_groups;
+ gpu->num_perfcntr_groups = a6xx_num_perfcntr_groups;
+ } else if ((ADRENO_7XX_GEN1 <= config->info->family) &&
+ (config->info->family <= ADRENO_7XX_GEN3)) {
+ gpu->perfcntr_groups = a7xx_perfcntr_groups;
+ gpu->num_perfcntr_groups = a7xx_num_perfcntr_groups;
+ } else if ((ADRENO_8XX_GEN1 <= config->info->family) &&
+ (config->info->family <= ADRENO_8XX_GEN2)) {
+ gpu->perfcntr_groups = a8xx_perfcntr_groups;
+ gpu->num_perfcntr_groups = a8xx_num_perfcntr_groups;
+ }
+
mutex_init(&a6xx_gpu->gmu.lock);
spin_lock_init(&a6xx_gpu->aperture_lock);

diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h
index 78e1478669be..8c08dc065372 100644
--- a/drivers/gpu/drm/msm/msm_gpu.h
+++ b/drivers/gpu/drm/msm/msm_gpu.h
@@ -24,6 +24,7 @@ struct msm_gem_submit;
struct msm_gem_vm_log_entry;
struct msm_gpu_state;
struct msm_context;
+struct msm_perfcntr_group;

struct msm_gpu_config {
const char *ioname;
@@ -262,6 +263,9 @@ struct msm_gpu {
bool allow_relocs;

struct thermal_cooling_device *cooling;
+
+ const struct msm_perfcntr_group *perfcntr_groups;
+ unsigned num_perfcntr_groups;
};

static inline struct msm_gpu *dev_to_gpu(struct device *dev)
diff --git a/drivers/gpu/drm/msm/msm_perfcntr.h b/drivers/gpu/drm/msm/msm_perfcntr.h
index 305dcde15c5e..64a5d29feba1 100644
--- a/drivers/gpu/drm/msm/msm_perfcntr.h
+++ b/drivers/gpu/drm/msm/msm_perfcntr.h
@@ -35,6 +35,15 @@ struct msm_perfcntr_group {
const struct msm_perfcntr_counter *counters;
};

+extern const struct msm_perfcntr_group a6xx_perfcntr_groups[];
+extern const unsigned a6xx_num_perfcntr_groups;
+
+extern const struct msm_perfcntr_group a7xx_perfcntr_groups[];
+extern const unsigned a7xx_num_perfcntr_groups;
+
+extern const struct msm_perfcntr_group a8xx_perfcntr_groups[];
+extern const unsigned a8xx_num_perfcntr_groups;
+
#define GROUP(_name, _pipe, _counters, _countables) { \
.name = _name, \
.pipe = _pipe, \
--
2.54.0