The series are: Acked-by: Leo Liu <leo.liu@xxxxxxx> On 12/13/18 1:08 PM, Zhu, James wrote: > Remove bit 31 for scratch2 to indicate the Hardware bug work around is active. > > Signed-off-by: James Zhu <James.Zhu@xxxxxxx> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c > index 564ed94..eb6b783 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c > @@ -279,7 +279,7 @@ static int amdgpu_vcn_pause_dpg_mode(struct amdgpu_device *adev, > > ring = &adev->vcn.ring_dec; > WREG32_SOC15(UVD, 0, mmUVD_RBC_RB_WPTR, > - RREG32_SOC15(UVD, 0, mmUVD_SCRATCH2)); > + RREG32_SOC15(UVD, 0, mmUVD_SCRATCH2) & 0x7FFFFFFF); > SOC15_WAIT_ON_RREG(UVD, 0, mmUVD_POWER_STATUS, > UVD_PGFSM_CONFIG__UVDM_UVDU_PWR_ON, > UVD_POWER_STATUS__UVD_POWER_STATUS_MASK, ret_code); > @@ -339,7 +339,7 @@ static int amdgpu_vcn_pause_dpg_mode(struct amdgpu_device *adev, > > ring = &adev->vcn.ring_dec; > WREG32_SOC15(UVD, 0, mmUVD_RBC_RB_WPTR, > - RREG32_SOC15(UVD, 0, mmUVD_SCRATCH2)); > + RREG32_SOC15(UVD, 0, mmUVD_SCRATCH2) & 0x7FFFFFFF); > SOC15_WAIT_ON_RREG(UVD, 0, mmUVD_POWER_STATUS, > UVD_PGFSM_CONFIG__UVDM_UVDU_PWR_ON, > UVD_POWER_STATUS__UVD_POWER_STATUS_MASK, ret_code); _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx
