drm/amdgpu/vcn:Apply new UMC enable for VNC DPG mode

Apply new UMC enable for VNC Dynamic Power Gate mode

Signed-off-by: James Zhu <James.Zhu@amd.com>
Acked-by: Leo Liu <leo.liu@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
index 93e2a408a59adc52b026cd2755ae9e72adc8d7bb..153f23acf8dd2d151eefea6d667b984baf6bdc42 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
@@ -829,13 +829,18 @@ static int vcn_v1_0_start_spg_mode(struct amdgpu_device *adev)
        /* enable VCPU clock */
        WREG32_SOC15(UVD, 0, mmUVD_VCPU_CNTL, UVD_VCPU_CNTL__CLK_EN_MASK);
 
+       /* boot up the VCPU */
+       WREG32_P(SOC15_REG_OFFSET(UVD, 0, mmUVD_SOFT_RESET), 0,
+                       ~UVD_SOFT_RESET__VCPU_SOFT_RESET_MASK);
+
        /* enable UMC */
        WREG32_P(SOC15_REG_OFFSET(UVD, 0, mmUVD_LMI_CTRL2), 0,
                        ~UVD_LMI_CTRL2__STALL_ARB_UMC_MASK);
 
-       /* boot up the VCPU */
-       WREG32_SOC15(UVD, 0, mmUVD_SOFT_RESET, 0);
-       mdelay(10);
+       tmp = RREG32_SOC15(UVD, 0, mmUVD_SOFT_RESET);
+       tmp &= ~UVD_SOFT_RESET__LMI_SOFT_RESET_MASK;
+       tmp &= ~UVD_SOFT_RESET__LMI_UMC_SOFT_RESET_MASK;
+       WREG32_SOC15(UVD, 0, mmUVD_SOFT_RESET, tmp);
 
        for (i = 0; i < 10; ++i) {
                uint32_t status;