diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2015-06-07 22:40:15 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:37:23 +1000 |
| commit | 9fc5ec6a488621e7f700725b7ef659eecb6d8224 (patch) | |
| tree | 4192b2a3ad6bce21d59dcc3d5fe2d484dfa96b6a /bin | |
| parent | ef26d8f059a73839e632d49cef7589daca23d95b (diff) | |
| download | nouveau-9fc5ec6a488621e7f700725b7ef659eecb6d8224.tar.gz | |
pm: reorganize the nvif interface
This commit introduces the NVIF_IOCTL_NEW_V0_PERFMON class which will be
used in order to query domains, signals and sources. This separates the
querying and the counting interface.
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/nv_perfmon.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/nv_perfmon.c b/bin/nv_perfmon.c index a8c583810..30a313821 100644 --- a/bin/nv_perfmon.c +++ b/bin/nv_perfmon.c @@ -600,7 +600,7 @@ main(int argc, char **argv) const char *cfg = NULL; const char *dbg = "error"; u64 dev = ~0ULL; - struct nvif_perfctr_query_v0 args = {}; + struct nvif_perfmon_query_signal_v0 args = {}; struct nvif_client *client; struct nvif_object object; int ret, c, k; @@ -644,15 +644,14 @@ main(int argc, char **argv) } ret = nvif_object_init(nvif_object(device), NULL, 0xdeadbeef, - NVIF_IOCTL_NEW_V0_PERFCTR, - &(struct nvif_perfctr_v0) { - }, sizeof(struct nvif_perfctr_v0), &object); + NVIF_IOCTL_NEW_V0_PERFMON, NULL, 0, &object); assert(ret == 0); do { u32 prev_iter = args.iter; args.name[0] = '\0'; - ret = nvif_mthd(&object, NVIF_PERFCTR_V0_QUERY, &args, sizeof(args)); + ret = nvif_mthd(&object, NVIF_PERFMON_V0_QUERY_SIGNAL, + &args, sizeof(args)); assert(ret == 0); if (prev_iter) { @@ -663,7 +662,8 @@ main(int argc, char **argv) args.iter = prev_iter; strncpy(signals[nr_signals - 1], args.name, sizeof(args.name)); - ret = nvif_mthd(&object, NVIF_PERFCTR_V0_QUERY, &args, sizeof(args)); + ret = nvif_mthd(&object, NVIF_PERFMON_V0_QUERY_SIGNAL, + &args, sizeof(args)); assert(ret == 0); } } while (args.iter != 0xffffffff); |