[PATCH] drm/amdgpu: Fix a bug in jpeg_v1_0_start()

Alex Deucher alexdeucher at gmail.com
Tue Nov 26 16:23:38 UTC 2019


On Tue, Nov 26, 2019 at 7:10 AM Dan Carpenter <dan.carpenter at oracle.com> wrote:
>
> Originally the last WREG32_SOC15() was a part of the if statement block
> but the curly braces are on the wrong line.
>
> Fixes: bb0db70f3f75 ("drm/amdgpu: separate JPEG1.0 code out from VCN1.0")
> Signed-off-by: Dan Carpenter <dan.carpenter at oracle.com>

Applied.  Thanks!

Alex

> ---
> From static analysis (Smatch).  Not tested.
>
>  drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c
> index 553506df077d..a141408dfb23 100644
> --- a/drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c
> @@ -522,7 +522,8 @@ void jpeg_v1_0_start(struct amdgpu_device *adev, int mode)
>                 WREG32_SOC15(JPEG, 0, mmUVD_LMI_JRBC_RB_64BIT_BAR_HIGH, upper_32_bits(ring->gpu_addr));
>                 WREG32_SOC15(JPEG, 0, mmUVD_JRBC_RB_RPTR, 0);
>                 WREG32_SOC15(JPEG, 0, mmUVD_JRBC_RB_WPTR, 0);
> -       }       WREG32_SOC15(JPEG, 0, mmUVD_JRBC_RB_CNTL, UVD_JRBC_RB_CNTL__RB_RPTR_WR_EN_MASK);
> +               WREG32_SOC15(JPEG, 0, mmUVD_JRBC_RB_CNTL, UVD_JRBC_RB_CNTL__RB_RPTR_WR_EN_MASK);
> +       }
>
>         /* initialize wptr */
>         ring->wptr = RREG32_SOC15(JPEG, 0, mmUVD_JRBC_RB_WPTR);
> --
> 2.11.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel


More information about the amd-gfx mailing list