aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLang Yu <Lang.Yu@amd.com>2024-03-25 13:24:31 +0800
committerAlex Deucher <alexander.deucher@amd.com>2024-04-09 23:12:20 -0400
commit0f1bbcc2bab25d5fb2dfb1ee3e08131437690d3d (patch)
tree2419faf7d1f96a88e9111b111c26398309d264b1
parent4b18a91faf1752f9bd69a4ed3aed2c8f6e5b0528 (diff)
downloadmm-0f1bbcc2bab25d5fb2dfb1ee3e08131437690d3d.tar.gz
drm/amdgpu/umsch: reinitialize write pointer in hw init
Otherwise the old one will be used during GPU reset. That's not expected. Signed-off-by: Lang Yu <Lang.Yu@amd.com> Reviewed-by: Feifei Xu <Feifei.Xu@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org
-rw-r--r--drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.c b/drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.c
index 84368cf1e17535..bd57896ab85d56 100644
--- a/drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.c
@@ -225,6 +225,8 @@ static int umsch_mm_v4_0_ring_start(struct amdgpu_umsch_mm *umsch)
WREG32_SOC15(VCN, 0, regVCN_UMSCH_RB_SIZE, ring->ring_size);
+ ring->wptr = 0;
+
data = RREG32_SOC15(VCN, 0, regVCN_RB_ENABLE);
data &= ~(VCN_RB_ENABLE__AUDIO_RB_EN_MASK);
WREG32_SOC15(VCN, 0, regVCN_RB_ENABLE, data);