[PATCH 2/2] drm/amdgpu/gfx11: Avoid uninitialised variable 'index'

[Alex Deucher]

Applied the series.  Thanks!

Alex

On Wed, May 4, 2022 at 6:24 PM Mike Lothian <mike at fireburn.co.uk> wrote:
>
> This stops clang complaining:
>
> drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c:376:6: warning: variable 'index' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized]
>         if (ring->is_mes_queue) {
>             ^~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c:433:30: note: uninitialized use occurs here
>         amdgpu_device_wb_free(adev, index);
>                                     ^~~~~
> drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c:376:2: note: remove the 'if' if its condition is always false
>         if (ring->is_mes_queue) {
>         ^~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c:364:16: note: initialize the variable 'index' to silence this warning
>         unsigned index;
>                       ^
>                        = 0
>
> Signed-off-by: Mike Lothian <mike at fireburn.co.uk>
> ---
>  drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
> index 141c64636577..c5655128fd9c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
> @@ -430,7 +430,8 @@ static int gfx_v11_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
>                 amdgpu_ib_free(adev, &ib, NULL);
>         dma_fence_put(f);
>  err1:
> -       amdgpu_device_wb_free(adev, index);
> +       if (!ring->is_mes_queue)
> +               amdgpu_device_wb_free(adev, index);
>         return r;
>  }
>
> --
> 2.35.1
>