diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2015-06-07 22:40:20 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:37:23 +1000 |
| commit | d869b19a1c4d9c82b2efad364b93022e9c862385 (patch) | |
| tree | 6d75c548fe8f442622441af428667d171093b0ca /bin | |
| parent | 6161834e83500cd950667c1ebb6d4506ee3b0fca (diff) | |
| download | nouveau-d869b19a1c4d9c82b2efad364b93022e9c862385.tar.gz | |
pm: use hardware signals indexes instead of user-readable names
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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/nv_perfmon.c b/bin/nv_perfmon.c index 043d8643a..50c777779 100644 --- a/bin/nv_perfmon.c +++ b/bin/nv_perfmon.c @@ -255,6 +255,7 @@ struct ui_perfmon_dom { struct ui_perfmon_sig { struct list_head head; char *name; + u8 signal; }; struct ui_main { @@ -299,6 +300,7 @@ ui_perfmon_query_signals(struct nvif_object *perfmon, if (prev_iter) { nr_signals++; sig = calloc(1, sizeof(*sig)); + sig->signal = args.signal; sig->name = malloc(sizeof(args.name)); strncpy(sig->name, args.name, sizeof(args.name)); list_add_tail(&sig->head, &dom->list); @@ -392,14 +394,14 @@ ui_main_select(void) list_for_each_entry(sig, &dom->list, head) { struct nvif_perfctr_v0 args = { .logic_op = 0xaaaa, + .domain = dom->id, }; item = calloc(1, sizeof(*item)); item->handle = ui_main_handle++; item->name = sig->name; - strncpy(args.name[0], item->name, sizeof(args.name[0])); - + args.signal[0] = sig->signal; ret = nvif_object_init(nvif_object(device), NULL, item->handle, NVIF_IOCTL_NEW_V0_PERFCTR, |