From: Samuel Pitoiset Date: Tue, 4 Aug 2015 21:58:12 +0000 (+0200) Subject: drm/nouveau/pm: allow zeroed signals to enable sources X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=7fe882eb90844f79acd9cdd3ccd5d3459c27cf3f;p=deliverable%2Flinux.git drm/nouveau/pm: allow zeroed signals to enable sources Hardware signals index 0x00 are defined for some domains and they have to be allowed to enable sources like the others. Signed-off-by: Samuel Pitoiset Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c index 94991d63640c..48c1ce6e663c 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c @@ -134,7 +134,7 @@ nvkm_perfsrc_enable(struct nvkm_pm *ppm, struct nvkm_perfctr *ctr) u32 mask, value; int i, j; - for (i = 0; i < 4 && ctr->signal[i]; i++) { + for (i = 0; i < 4; i++) { for (j = 0; j < 8 && ctr->source[i][j]; j++) { sig = nvkm_perfsig_find(ppm, ctr->domain, ctr->signal[i], &dom); @@ -170,7 +170,7 @@ nvkm_perfsrc_disable(struct nvkm_pm *ppm, struct nvkm_perfctr *ctr) u32 mask; int i, j; - for (i = 0; i < 4 && ctr->signal[i]; i++) { + for (i = 0; i < 4; i++) { for (j = 0; j < 8 && ctr->source[i][j]; j++) { sig = nvkm_perfsig_find(ppm, ctr->domain, ctr->signal[i], &dom);