From: Dan Carpenter Date: Tue, 26 Nov 2019 12:10:29 +0000 (+0300) Subject: drm/amdgpu: Fix a bug in jpeg_v1_0_start() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f4618fe9c26d749613d53ee9d661b6baf9af3b12;p=linux.git drm/amdgpu: Fix a bug in jpeg_v1_0_start() 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 Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c index 553506df077de..a141408dfb23d 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);