From: Leo Liu Date: Tue, 28 Jan 2020 17:21:52 +0000 (-0500) Subject: drm/amdgpu: set the LMI ctrl and reset earlier X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d6b0185b8dc738b13f2edb216c0a08f947cd33ca;p=linux.git drm/amdgpu: set the LMI ctrl and reset earlier So the LMI register will be programmed properly Signed-off-by: Leo Liu Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c index dddae2b8f0f93..5174842923039 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c @@ -712,6 +712,15 @@ static int vcn_v3_0_start(struct amdgpu_device *adev) WREG32_P(SOC15_REG_OFFSET(VCN, i, mmUVD_MASTINT_EN), 0, ~UVD_MASTINT_EN__VCPU_EN_MASK); + /* enable LMI MC and UMC channels */ + WREG32_P(SOC15_REG_OFFSET(VCN, i, mmUVD_LMI_CTRL2), 0, + ~UVD_LMI_CTRL2__STALL_ARB_UMC_MASK); + + tmp = RREG32_SOC15(VCN, i, mmUVD_SOFT_RESET); + tmp &= ~UVD_SOFT_RESET__LMI_SOFT_RESET_MASK; + tmp &= ~UVD_SOFT_RESET__LMI_UMC_SOFT_RESET_MASK; + WREG32_SOC15(VCN, i, mmUVD_SOFT_RESET, tmp); + /* setup mmUVD_LMI_CTRL */ tmp = RREG32_SOC15(VCN, i, mmUVD_LMI_CTRL); WREG32_SOC15(VCN, i, mmUVD_LMI_CTRL, tmp | @@ -752,15 +761,6 @@ static int vcn_v3_0_start(struct amdgpu_device *adev) WREG32_SOC15(VCN, i, mmUVD_GFX10_ADDR_CONFIG, adev->gfx.config.gb_addr_config); - /* enable LMI MC and UMC channels */ - WREG32_P(SOC15_REG_OFFSET(VCN, i, mmUVD_LMI_CTRL2), 0, - ~UVD_LMI_CTRL2__STALL_ARB_UMC_MASK); - - tmp = RREG32_SOC15(VCN, i, mmUVD_SOFT_RESET); - tmp &= ~UVD_SOFT_RESET__LMI_SOFT_RESET_MASK; - tmp &= ~UVD_SOFT_RESET__LMI_UMC_SOFT_RESET_MASK; - WREG32_SOC15(VCN, i, mmUVD_SOFT_RESET, tmp); - /* unblock VCPU register access */ WREG32_P(SOC15_REG_OFFSET(VCN, i, mmUVD_RB_ARB_CTRL), 0, ~UVD_RB_ARB_CTRL__VCPU_DIS_MASK);