drm/nouveau/pmu: don't print reply values if exec is false

Submitted by Colin King on Dec. 19, 2018, 3:29 p.m.

Details

Message ID 20181219152949.14669-1-colin.king@canonical.com
State New
Headers show
Series "drm/nouveau/pmu: don't print reply values if exec is false" ( rev: 1 ) in DRI devel

Not browsing as part of any series.

Commit Message

Colin King Dec. 19, 2018, 3:29 p.m.
From: Colin Ian King <colin.king@canonical.com>

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>
---
 drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c
index 11b28b086a06..7b052879af72 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c
@@ -88,10 +88,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;
 }

Comments

ping?

On 19/12/2018 15:29, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> 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>
> ---
>  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 11b28b086a06..7b052879af72 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/memx.c
> @@ -88,10 +88,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;
>  }
>