Skip to content

Commit efd6d85

Browse files
Boyz-Radeonalexdeucher
authored andcommitted
drm/amdgpu/vcn3.0: remove old DPG workaround
Port from VCN2.5 SCRATCH2 is used to keep decode wptr as a workaround which fix a hardware DPG decode wptr update bug for vcn2.5 beforehand. Signed-off-by: Boyuan Zhang <boyuan.zhang@amd.com> Reviewed-by: James Zhu <James.Zhu@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org # 5.9.x
1 parent ac2db94 commit efd6d85

1 file changed

Lines changed: 0 additions & 7 deletions

File tree

drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1587,9 +1587,6 @@ static int vcn_v3_0_pause_dpg_mode(struct amdgpu_device *adev,
15871587
WREG32_SOC15(VCN, inst_idx, mmUVD_RB_RPTR2, lower_32_bits(ring->wptr));
15881588
WREG32_SOC15(VCN, inst_idx, mmUVD_RB_WPTR2, lower_32_bits(ring->wptr));
15891589

1590-
WREG32_SOC15(VCN, inst_idx, mmUVD_RBC_RB_WPTR,
1591-
RREG32_SOC15(VCN, inst_idx, mmUVD_SCRATCH2) & 0x7FFFFFFF);
1592-
15931590
/* Unstall DPG */
15941591
WREG32_P(SOC15_REG_OFFSET(VCN, inst_idx, mmUVD_POWER_STATUS),
15951592
0, ~UVD_POWER_STATUS__STALL_DPG_POWER_UP_MASK);
@@ -1650,10 +1647,6 @@ static void vcn_v3_0_dec_ring_set_wptr(struct amdgpu_ring *ring)
16501647
{
16511648
struct amdgpu_device *adev = ring->adev;
16521649

1653-
if (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG)
1654-
WREG32_SOC15(VCN, ring->me, mmUVD_SCRATCH2,
1655-
lower_32_bits(ring->wptr) | 0x80000000);
1656-
16571650
if (ring->use_doorbell) {
16581651
adev->wb.wb[ring->wptr_offs] = lower_32_bits(ring->wptr);
16591652
WDOORBELL32(ring->doorbell_index, lower_32_bits(ring->wptr));

0 commit comments

Comments
 (0)