drm/nouveau/pmu: don't print reply values if exec is false
authorColin Ian King <colin.king@canonical.com>
Wed, 19 Dec 2018 15:29:49 +0000 (15:29 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Jan 2020 09:24:17 +0000 (10:24 +0100)
[ Upstream commit b1d03fc36ec9834465a08c275c8d563e07f6f6bf ]

Currently the uninitialized values in the array reply are printed out
when exec is false and nvkm_pmu_send has not updated the array. Avoid
confusion by only dumping out these values if they have been actually
updated.

Detected by CoverityScan, CID#1271291 ("Uninitialized scaler variable")
Fixes: ebb58dc2ef8c ("drm/nouveau/pmu: rename from pwr (no binary change)")

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c

index e6f74168238c72ecc426471f061f676d66cc0829..2ef9e942f43a243d0d6d0316f227988cf28f302b 100644 (file)
@@ -87,10 +87,10 @@ nvkm_memx_fini(struct nvkm_memx **pmemx, bool exec)
        if (exec) {
                nvkm_pmu_send(pmu, reply, PROC_MEMX, MEMX_MSG_EXEC,
                              memx->base, finish);
+               nvkm_debug(subdev, "Exec took %uns, PMU_IN %08x\n",
+                          reply[0], reply[1]);
        }
 
-       nvkm_debug(subdev, "Exec took %uns, PMU_IN %08x\n",
-                  reply[0], reply[1]);
        kfree(memx);
        return 0;
 }