aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
index e597116d8282..0f3597c221c7 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
@@ -983,11 +983,13 @@ static int vcn_v1_0_start_dpg_mode(struct amdgpu_device *adev)
983 983
984 /* initialize VCN memory controller */ 984 /* initialize VCN memory controller */
985 WREG32_SOC15_DPG_MODE(UVD, 0, mmUVD_LMI_CTRL, 985 WREG32_SOC15_DPG_MODE(UVD, 0, mmUVD_LMI_CTRL,
986 (0x40 << UVD_LMI_CTRL__WRITE_CLEAN_TIMER__SHIFT) | 986 (8 << UVD_LMI_CTRL__WRITE_CLEAN_TIMER__SHIFT) |
987 UVD_LMI_CTRL__WRITE_CLEAN_TIMER_EN_MASK | 987 UVD_LMI_CTRL__WRITE_CLEAN_TIMER_EN_MASK |
988 UVD_LMI_CTRL__DATA_COHERENCY_EN_MASK | 988 UVD_LMI_CTRL__DATA_COHERENCY_EN_MASK |
989 UVD_LMI_CTRL__VCPU_DATA_COHERENCY_EN_MASK | 989 UVD_LMI_CTRL__VCPU_DATA_COHERENCY_EN_MASK |
990 UVD_LMI_CTRL__REQ_MODE_MASK | 990 UVD_LMI_CTRL__REQ_MODE_MASK |
991 UVD_LMI_CTRL__CRC_RESET_MASK |
992 UVD_LMI_CTRL__MASK_MC_URGENT_MASK |
991 0x00100000L, 0xFFFFFFFF, 0); 993 0x00100000L, 0xFFFFFFFF, 0);
992 994
993#ifdef __BIG_ENDIAN 995#ifdef __BIG_ENDIAN
@@ -1041,13 +1043,14 @@ static int vcn_v1_0_start_dpg_mode(struct amdgpu_device *adev)
1041 vcn_v1_0_clock_gating_dpg_mode(adev, 1); 1043 vcn_v1_0_clock_gating_dpg_mode(adev, 1);
1042 /* setup mmUVD_LMI_CTRL */ 1044 /* setup mmUVD_LMI_CTRL */
1043 WREG32_SOC15_DPG_MODE(UVD, 0, mmUVD_LMI_CTRL, 1045 WREG32_SOC15_DPG_MODE(UVD, 0, mmUVD_LMI_CTRL,
1044 (UVD_LMI_CTRL__WRITE_CLEAN_TIMER_EN_MASK | 1046 (8 << UVD_LMI_CTRL__WRITE_CLEAN_TIMER__SHIFT) |
1045 UVD_LMI_CTRL__CRC_RESET_MASK | 1047 UVD_LMI_CTRL__WRITE_CLEAN_TIMER_EN_MASK |
1046 UVD_LMI_CTRL__MASK_MC_URGENT_MASK | 1048 UVD_LMI_CTRL__DATA_COHERENCY_EN_MASK |
1047 UVD_LMI_CTRL__DATA_COHERENCY_EN_MASK | 1049 UVD_LMI_CTRL__VCPU_DATA_COHERENCY_EN_MASK |
1048 UVD_LMI_CTRL__VCPU_DATA_COHERENCY_EN_MASK | 1050 UVD_LMI_CTRL__REQ_MODE_MASK |
1049 (8 << UVD_LMI_CTRL__WRITE_CLEAN_TIMER__SHIFT) | 1051 UVD_LMI_CTRL__CRC_RESET_MASK |
1050 0x00100000L), 0xFFFFFFFF, 1); 1052 UVD_LMI_CTRL__MASK_MC_URGENT_MASK |
1053 0x00100000L, 0xFFFFFFFF, 1);
1051 1054
1052 tmp = adev->gfx.config.gb_addr_config; 1055 tmp = adev->gfx.config.gb_addr_config;
1053 /* setup VCN global tiling registers */ 1056 /* setup VCN global tiling registers */