tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

drm/amdgpu/vcn:Remove bit 31 for scratch2 to indicate the WA is active

Remove bit 31 for scratch2 to indicate the Hardware bug work around is active.

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>

authored by

James Zhu and committed by
Alex Deucher 9194fb22 12e8b301

+2 -2
+2 -2
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
··· 262 262 263 263 ring = &adev->vcn.ring_dec; 264 264 WREG32_SOC15(UVD, 0, mmUVD_RBC_RB_WPTR, 265 - RREG32_SOC15(UVD, 0, mmUVD_SCRATCH2)); 265 + RREG32_SOC15(UVD, 0, mmUVD_SCRATCH2) & 0x7FFFFFFF); 266 266 SOC15_WAIT_ON_RREG(UVD, 0, mmUVD_POWER_STATUS, 267 267 UVD_PGFSM_CONFIG__UVDM_UVDU_PWR_ON, 268 268 UVD_POWER_STATUS__UVD_POWER_STATUS_MASK, ret_code); ··· 322 322 323 323 ring = &adev->vcn.ring_dec; 324 324 WREG32_SOC15(UVD, 0, mmUVD_RBC_RB_WPTR, 325 - RREG32_SOC15(UVD, 0, mmUVD_SCRATCH2)); 325 + RREG32_SOC15(UVD, 0, mmUVD_SCRATCH2) & 0x7FFFFFFF); 326 326 SOC15_WAIT_ON_RREG(UVD, 0, mmUVD_POWER_STATUS, 327 327 UVD_PGFSM_CONFIG__UVDM_UVDU_PWR_ON, 328 328 UVD_POWER_STATUS__UVD_POWER_STATUS_MASK, ret_code);