Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44d9de58 authored by Samuel Pitoiset's avatar Samuel Pitoiset Committed by Ben Skeggs
Browse files

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: default avatarSamuel Pitoiset <samuel.pitoiset@gmail.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 5a0bc4b5

drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -294,6 +294,9 @@ nvkm_perfctr_ctor(struct nvkm_object *parent, struct nvkm_object *engine, 
			return -EINVAL;

			return -EINVAL;

	}

	}





	if (!dom)

		return -EINVAL;



	ret = nvkm_object_create(parent, engine, oclass, 0, &ctr);

	ret = nvkm_object_create(parent, engine, oclass, 0, &ctr);

	*pobject = nv_object(ctr);

	*pobject = nv_object(ctr);

	if (ret)

	if (ret)
@@ -305,7 +308,6 @@ nvkm_perfctr_ctor(struct nvkm_object *parent, struct nvkm_object *engine, 
	ctr->signal[1] = sig[1];

	ctr->signal[1] = sig[1];

	ctr->signal[2] = sig[2];

	ctr->signal[2] = sig[2];

	ctr->signal[3] = sig[3];

	ctr->signal[3] = sig[3];

	if (dom)

	list_add_tail(&ctr->head, &dom->list);

	list_add_tail(&ctr->head, &dom->list);

	return 0;

	return 0;

}

}