| From 026c50bfa53d2d5d1d924dd452b4c54cc87491fe Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 19 Dec 2018 15:29:49 +0000 |
| Subject: drm/nouveau/pmu: don't print reply values if exec is false |
| |
| From: Colin Ian King <colin.king@canonical.com> |
| |
| [ 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 | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c |
| index e6f74168238c7..2ef9e942f43a2 100644 |
| --- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c |
| +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c |
| @@ -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; |
| } |
| -- |
| 2.20.1 |
| |
