diff options
author | James Zhu <James.Zhu@amd.com> | 2018-12-12 14:48:33 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-12-18 17:38:37 -0500 |
commit | e0d460a4d2d160afbfad4ac2b9acd17ccb3d110b (patch) | |
tree | b3bb24faaa7fba5785274f0619a0aec7f8e0d42a /drivers/gpu | |
parent | 5d65cab6c614f95549b19416b2aad824c6d9283a (diff) | |
download | linux-stable-e0d460a4d2d160afbfad4ac2b9acd17ccb3d110b.tar.gz linux-stable-e0d460a4d2d160afbfad4ac2b9acd17ccb3d110b.tar.bz2 linux-stable-e0d460a4d2d160afbfad4ac2b9acd17ccb3d110b.zip |
drm/amdgpu/vcn:Update ring point to JPEG before init JPEG wptr
It is a bug fix.
Signed-off-by: James Zhu <James.Zhu@amd.com>
Acked-by: Leo Liu <leo.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c index 775204315888..5df6ea9e87e0 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 */ |