diff mbox

drm/amdgpu: Avoid possibly uninitialized variable

Message ID 1439553148-2690-1-git-send-email-thierry.reding@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Thierry Reding Aug. 14, 2015, 11:52 a.m. UTC
From: Thierry Reding <treding@nvidia.com>

The min_ctx_size is only initialized for H265, so garbage will end up in
buf_sizes[4] for all other stream types. Better initialize the value to
0 to avoid unpleasant surprises.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Christian König Aug. 14, 2015, 12:35 p.m. UTC | #1
On 14.08.2015 13:52, Thierry Reding wrote:
> From: Thierry Reding <treding@nvidia.com>
>
> The min_ctx_size is only initialized for H265, so garbage will end up in
> buf_sizes[4] for all other stream types. Better initialize the value to
> 0 to avoid unpleasant surprises.
>
> Signed-off-by: Thierry Reding <treding@nvidia.com>

Reviewed-by: Christian König <christian.koenig@amd.com>

We already stumbled over this internally as well, not sure if Alex is 
going to merge your patch or the internal version.

Regards,
Christian.

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
> index f5c22556ec2c..91e79c3f2403 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
> @@ -374,7 +374,7 @@ static int amdgpu_uvd_cs_msg_decode(uint32_t *msg, unsigned buf_sizes[])
>   	unsigned height_in_mb = ALIGN(height / 16, 2);
>   	unsigned fs_in_mb = width_in_mb * height_in_mb;
>   
> -	unsigned image_size, tmp, min_dpb_size, num_dpb_buffer, min_ctx_size;
> +	unsigned image_size, tmp, min_dpb_size, num_dpb_buffer, min_ctx_size = 0;
>   
>   	image_size = width * height;
>   	image_size += image_size / 2;
diff mbox

Patch

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
index f5c22556ec2c..91e79c3f2403 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
@@ -374,7 +374,7 @@  static int amdgpu_uvd_cs_msg_decode(uint32_t *msg, unsigned buf_sizes[])
 	unsigned height_in_mb = ALIGN(height / 16, 2);
 	unsigned fs_in_mb = width_in_mb * height_in_mb;
 
-	unsigned image_size, tmp, min_dpb_size, num_dpb_buffer, min_ctx_size;
+	unsigned image_size, tmp, min_dpb_size, num_dpb_buffer, min_ctx_size = 0;
 
 	image_size = width * height;
 	image_size += image_size / 2;