summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>2015-06-19 17:36:37 +0200
committerBen Skeggs <bskeggs@redhat.com>2015-07-28 17:22:40 +1000
commit2813d40f292c37021995d606a42d651972b162ba (patch)
tree05fb6bb8c2dfc8a51b1b390b2a23e8e1e0877e39
parentebabfb8404e3a8953c61dc01483a5bdfdf33b5b4 (diff)
downloadnouveau-2813d40f292c37021995d606a42d651972b162ba.tar.gz
pm: expose name of domains
This is going to be very useful for GF100+ because each GPC can have its own domain of counters. Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drm/nouveau/include/nvif/class.h1
-rw-r--r--drm/nouveau/nvkm/engine/pm/base.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/drm/nouveau/include/nvif/class.h b/drm/nouveau/include/nvif/class.h
index 3b7f49f87..59d598357 100644
--- a/drm/nouveau/include/nvif/class.h
+++ b/drm/nouveau/include/nvif/class.h
@@ -262,6 +262,7 @@ struct nvif_perfmon_query_domain_v0 {
__u8 iter;
__u16 signal_nr;
__u8 pad05[2];
+ char name[64];
};
struct nvif_perfmon_query_signal_v0 {
diff --git a/drm/nouveau/nvkm/engine/pm/base.c b/drm/nouveau/nvkm/engine/pm/base.c
index 7866e220b..94991d636 100644
--- a/drm/nouveau/nvkm/engine/pm/base.c
+++ b/drm/nouveau/nvkm/engine/pm/base.c
@@ -454,6 +454,7 @@ nvkm_perfmon_mthd_query_domain(struct nvkm_object *object, void *data, u32 size)
args->v0.id = di;
args->v0.signal_nr = nvkm_perfdom_count_perfsig(dom);
+ strncpy(args->v0.name, dom->name, sizeof(args->v0.name));
/* Currently only global counters (PCOUNTER) are implemented
* but this will be different for local counters (MP). */