drm/nouveau/pm: prevent creating a perfctr object when signals are not found

Since a new class has been introduced to query signals, we can now
return an error when the userspace wants to monitor unknown signals.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c
index cb88170610bbb4c70f48373efb5a16176a627d8f..2f851473cecfd1d107dcfa4d6ef8980b20eee976 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c
@@ -294,6 +294,9 @@ nvkm_perfctr_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
                        return -EINVAL;
        }
 
+       if (!dom)
+               return -EINVAL;
+
        ret = nvkm_object_create(parent, engine, oclass, 0, &ctr);
        *pobject = nv_object(ctr);
        if (ret)
@@ -305,8 +308,7 @@ nvkm_perfctr_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
        ctr->signal[1] = sig[1];
        ctr->signal[2] = sig[2];
        ctr->signal[3] = sig[3];
-       if (dom)
-               list_add_tail(&ctr->head, &dom->list);
+       list_add_tail(&ctr->head, &dom->list);
        return 0;
 }