From: James Zhu Date: Wed, 12 Dec 2018 19:48:33 +0000 (-0500) Subject: drm/amdgpu/vcn:Update ring point to JPEG before init JPEG wptr X-Git-Tag: v5.0-rc1~13^2~1^2~33 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e0d460a4d2d160afbfad4ac2b9acd17ccb3d110b;p=thirdparty%2Fkernel%2Flinux.git drm/amdgpu/vcn:Update ring point to JPEG before init JPEG wptr It is a bug fix. Signed-off-by: James Zhu Acked-by: Leo Liu Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c index 775204315888f..5df6ea9e87e0d 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c @@ -1088,7 +1088,8 @@ static int vcn_v1_0_start_dpg_mode(struct amdgpu_device *adev) WREG32_P(SOC15_REG_OFFSET(UVD, 0, mmUVD_RBC_RB_CNTL), 0, ~UVD_RBC_RB_CNTL__RB_NO_FETCH_MASK); - /* initialize wptr */ + /* initialize JPEG wptr */ + ring = &adev->vcn.ring_jpeg; ring->wptr = RREG32_SOC15(UVD, 0, mmUVD_JRBC_RB_WPTR); /* copy patch commands to the jpeg ring */