|
@@ -1023,13 +1023,14 @@ static int vcn_v1_0_start_dpg_mode(struct amdgpu_device *adev)
|
|
WREG32_SOC15_DPG_MODE(UVD, 0, mmUVD_REG_XX_MASK, 0x10, 0xFFFFFFFF, 0);
|
|
WREG32_SOC15_DPG_MODE(UVD, 0, mmUVD_REG_XX_MASK, 0x10, 0xFFFFFFFF, 0);
|
|
WREG32_SOC15_DPG_MODE(UVD, 0, mmUVD_RBC_XX_IB_REG_CHECK, 0x3, 0xFFFFFFFF, 0);
|
|
WREG32_SOC15_DPG_MODE(UVD, 0, mmUVD_RBC_XX_IB_REG_CHECK, 0x3, 0xFFFFFFFF, 0);
|
|
|
|
|
|
- /* enable UMC */
|
|
|
|
- WREG32_SOC15_DPG_MODE(UVD, 0, mmUVD_LMI_CTRL2,
|
|
|
|
- 0, UVD_LMI_CTRL2__STALL_ARB_UMC_MASK, 0);
|
|
|
|
-
|
|
|
|
/* boot up the VCPU */
|
|
/* boot up the VCPU */
|
|
WREG32_SOC15_DPG_MODE(UVD, 0, mmUVD_SOFT_RESET, 0, 0xFFFFFFFF, 0);
|
|
WREG32_SOC15_DPG_MODE(UVD, 0, mmUVD_SOFT_RESET, 0, 0xFFFFFFFF, 0);
|
|
|
|
|
|
|
|
+ /* enable UMC */
|
|
|
|
+ WREG32_SOC15_DPG_MODE(UVD, 0, mmUVD_LMI_CTRL2,
|
|
|
|
+ 0x1F << UVD_LMI_CTRL2__RE_OFLD_MIF_WR_REQ_NUM__SHIFT,
|
|
|
|
+ 0xFFFFFFFF, 0);
|
|
|
|
+
|
|
/* enable master interrupt */
|
|
/* enable master interrupt */
|
|
WREG32_SOC15_DPG_MODE(UVD, 0, mmUVD_MASTINT_EN,
|
|
WREG32_SOC15_DPG_MODE(UVD, 0, mmUVD_MASTINT_EN,
|
|
UVD_MASTINT_EN__VCPU_EN_MASK, UVD_MASTINT_EN__VCPU_EN_MASK, 0);
|
|
UVD_MASTINT_EN__VCPU_EN_MASK, UVD_MASTINT_EN__VCPU_EN_MASK, 0);
|