drm/amdgpu: not set bypass mode for uvd5.0/uvd6.0
Subsystems (2)
PATCH 1/5 drm/amdgpu: not set bypass mode for uvd5.0/uvd6.0
--- drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 15 --------------- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 18 ++---------------- 2 files changed, 2 insertions(+), 31 deletions(-)
drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +0 -15
@@ -724,19 +724,6 @@ static void uvd_v5_0_set_hw_clock_gating(struct amdgpu_device *adev) }#endif -static void uvd_v5_0_set_bypass_mode (struct amdgpu_device *adev,bool enable) -{ -u32 tmp =RREG32_SMC (ixGCK_DFS_BYPASS_CNTL); - -if (enable) - tmp |= (GCK_DFS_BYPASS_CNTL__BYPASSDCLK_MASK | -GCK_DFS_BYPASS_CNTL__BYPASSVCLK_MASK ); -else - tmp &= ~(GCK_DFS_BYPASS_CNTL__BYPASSDCLK_MASK | -GCK_DFS_BYPASS_CNTL__BYPASSVCLK_MASK ); - -WREG32_SMC (ixGCK_DFS_BYPASS_CNTL, tmp); -}static int uvd_v5_0_set_clockgating_state (void *handle,enum amd_clockgating_state state)
@@ -745,8 +732,6 @@ static int uvd_v5_0_set_clockgating_state(void *handle,bool enable = (state ==AMD_CG_STATE_GATE ) ? true : false;static int curstate =-1 ; -uvd_v5_0_set_bypass_mode (adev, enable); -if (!(adev->cg_flags &AMD_CG_SUPPORT_UVD_MGCG ))return 0 ;
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +2 -16
@@ -151,6 +151,8 @@ static int uvd_v6_0_hw_init(void *handle)uint32_t tmp;int r; +amdgpu_asic_set_uvd_clocks (adev,10000 ,10000 ); + r =uvd_v6_0_start (adev);if (r) goto done;
@@ -935,28 +937,12 @@ static void uvd_v6_0_set_hw_clock_gating(struct amdgpu_device *adev) }#endif -static void uvd_v6_0_set_bypass_mode (struct amdgpu_device *adev,bool enable) -{ -u32 tmp =RREG32_SMC (ixGCK_DFS_BYPASS_CNTL); - -if (enable) - tmp |= (GCK_DFS_BYPASS_CNTL__BYPASSDCLK_MASK | -GCK_DFS_BYPASS_CNTL__BYPASSVCLK_MASK ); -else - tmp &= ~(GCK_DFS_BYPASS_CNTL__BYPASSDCLK_MASK | -GCK_DFS_BYPASS_CNTL__BYPASSVCLK_MASK ); - -WREG32_SMC (ixGCK_DFS_BYPASS_CNTL, tmp); -} -static int uvd_v6_0_set_clockgating_state (void *handle,enum amd_clockgating_state state) {struct amdgpu_device *adev = (struct amdgpu_device *)handle;bool enable = (state ==AMD_CG_STATE_GATE ) ? true : false; -uvd_v6_0_set_bypass_mode (adev, enable); -if (!(adev->cg_flags &AMD_CG_SUPPORT_UVD_MGCG ))return 0 ;
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1478677305-12579-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org
PATCH 2/5 drm/amd/powerplay: partial revert commit 01b0e7fb1.
when uvd is idle, we gate uvd clock.
and uvd is busy, we ungate uvd clock.
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_clockpowergating.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_clockpowergating.c +2 -2
@@ -149,7 +149,7 @@ int smu7_powergate_uvd(struct pp_hwmgr *hwmgr, bool bgate)if (bgate) {cgs_set_clockgating_state (hwmgr->device,AMD_IP_BLOCK_TYPE_UVD , -AMD_CG_STATE_UNGATE ); +AMD_CG_STATE_GATE );cgs_set_powergating_state (hwmgr->device,AMD_IP_BLOCK_TYPE_UVD ,AMD_PG_STATE_GATE );
@@ -162,7 +162,7 @@ int smu7_powergate_uvd(struct pp_hwmgr *hwmgr, bool bgate) AMD_CG_STATE_UNGATE);cgs_set_clockgating_state (hwmgr->device,AMD_IP_BLOCK_TYPE_UVD , -AMD_CG_STATE_GATE ); +AMD_CG_STATE_UNGATE );smu7_update_uvd_dpm (hwmgr, false); }
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/5 drm/amdgpu: refine uvd 5.0 clock gate feature.
In reply to a message not in the archive1. fix uvd cg status not correct.
2. fix uvd pg can't work on tonga.
3. enable uvd mgcg.
--- drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 106 ++++++++++++++++++++++++++-------- 1 file changed, 83 insertions(+), 23 deletions(-)
drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +83 -23
@@ -40,7 +40,10 @@ static void uvd_v5_0_set_ring_funcs(struct amdgpu_device *adev);static void uvd_v5_0_set_irq_funcs (struct amdgpu_device *adev);static int uvd_v5_0_start (struct amdgpu_device *adev);static void uvd_v5_0_stop (struct amdgpu_device *adev); - +static int uvd_v5_0_set_clockgating_state (void *handle, +enum amd_clockgating_state state); +static void uvd_v5_0_enable_mgcg (struct amdgpu_device *adev, +bool enable);/** * uvd_v5_0_ring_get_rptr - get read pointer *
@@ -149,9 +152,6 @@ static int uvd_v5_0_hw_init(void *handle)uint32_t tmp;int r; -/* raise clocks while booting up the VCPU */ -amdgpu_asic_set_uvd_clocks (adev,53300 ,40000 ); - r =uvd_v5_0_start (adev);if (r) goto done;
@@ -189,11 +189,7 @@ static int uvd_v5_0_hw_init(void *handle)amdgpu_ring_write (ring,3 );amdgpu_ring_commit (ring); - done: -/* lower clocks again */ -amdgpu_asic_set_uvd_clocks (adev,0 ,0 ); -if (!r)DRM_INFO ("UVD initialized successfully.\n" );
@@ -226,6 +222,7 @@ static int uvd_v5_0_suspend(void *handle) r =uvd_v5_0_hw_fini (adev);if (r)return r; +uvd_v5_0_set_clockgating_state (adev,AMD_CG_STATE_GATE ); r =amdgpu_uvd_suspend (adev);if (r)
@@ -313,8 +310,9 @@ static int uvd_v5_0_start(struct amdgpu_device *adev)uvd_v5_0_mc_resume (adev); -/* disable clock gating */ -WREG32 (mmUVD_CGC_GATE,0 ); +amdgpu_asic_set_uvd_clocks (adev,10000 ,10000 ); +uvd_v5_0_set_clockgating_state (adev,AMD_CG_STATE_UNGATE ); +uvd_v5_0_enable_mgcg (adev, true);/* disable interupt */ WREG32_P (mmUVD_MASTINT_EN,0 , ~(1 <<1 ));
@@ -628,16 +626,12 @@ static int uvd_v5_0_process_interrupt(struct amdgpu_device *adev,return 0 ; } -static void uvd_v5_0_set_sw_clock_gating (struct amdgpu_device *adev) +static void uvd_v5_0_enable_clock_gating (struct amdgpu_device *adev,bool enable) { -uint32_t data, data1, data2, suvd_flags; +uint32_t data1, data3, suvd_flags; - data =RREG32 (mmUVD_CGC_CTRL); data1 =RREG32 (mmUVD_SUVD_CGC_GATE); - data2 =RREG32 (mmUVD_SUVD_CGC_CTRL); - - data &= ~(UVD_CGC_CTRL__CLK_OFF_DELAY_MASK | -UVD_CGC_CTRL__CLK_GATE_DLY_TIMER_MASK ); + data3 =RREG32 (mmUVD_CGC_GATE); suvd_flags =UVD_SUVD_CGC_GATE__SRE_MASK | UVD_SUVD_CGC_GATE__SIT_MASK |
@@ -645,6 +639,49 @@ static void uvd_v5_0_set_sw_clock_gating(struct amdgpu_device *adev)UVD_SUVD_CGC_GATE__SCM_MASK |UVD_SUVD_CGC_GATE__SDB_MASK ; +if (enable) { + data3 |= (UVD_CGC_GATE__SYS_MASK | +UVD_CGC_GATE__UDEC_MASK | +UVD_CGC_GATE__MPEG2_MASK | +UVD_CGC_GATE__RBC_MASK | +UVD_CGC_GATE__LMI_MC_MASK | +UVD_CGC_GATE__IDCT_MASK | +UVD_CGC_GATE__MPRD_MASK | +UVD_CGC_GATE__MPC_MASK | +UVD_CGC_GATE__LBSI_MASK | +UVD_CGC_GATE__LRBBM_MASK | +UVD_CGC_GATE__UDEC_RE_MASK | +UVD_CGC_GATE__UDEC_CM_MASK | +UVD_CGC_GATE__UDEC_IT_MASK | +UVD_CGC_GATE__UDEC_DB_MASK | +UVD_CGC_GATE__UDEC_MP_MASK | +UVD_CGC_GATE__WCB_MASK | +UVD_CGC_GATE__VCPU_MASK | +UVD_CGC_GATE__JPEG_MASK | +UVD_CGC_GATE__SCPU_MASK ); + data3 &= ~UVD_CGC_GATE__REGS_MASK ; + data1 |= suvd_flags; + }else { + data3 =0 ; + data1 =0 ; + } + +WREG32 (mmUVD_SUVD_CGC_GATE, data1); +WREG32 (mmUVD_CGC_GATE, data3); +} + +static void uvd_v5_0_set_sw_clock_gating (struct amdgpu_device *adev) +{ +uint32_t data, data2; + + data =RREG32 (mmUVD_CGC_CTRL); + data2 =RREG32 (mmUVD_SUVD_CGC_CTRL); + + + data &= ~(UVD_CGC_CTRL__CLK_OFF_DELAY_MASK | +UVD_CGC_CTRL__CLK_GATE_DLY_TIMER_MASK ); + + data |=UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK | (1 <<REG_FIELD_SHIFT (UVD_CGC_CTRL ,CLK_GATE_DLY_TIMER )) | (4 <<REG_FIELD_SHIFT (UVD_CGC_CTRL ,CLK_OFF_DELAY ));
@@ -675,11 +712,8 @@ static void uvd_v5_0_set_sw_clock_gating(struct amdgpu_device *adev)UVD_SUVD_CGC_CTRL__SMP_MODE_MASK |UVD_SUVD_CGC_CTRL__SCM_MODE_MASK | UVD_SUVD_CGC_CTRL__SDB_MODE_MASK); - data1 |= suvd_flags;WREG32 (mmUVD_CGC_CTRL, data); -WREG32 (mmUVD_CGC_GATE,0 ); -WREG32 (mmUVD_SUVD_CGC_GATE, data1);WREG32 (mmUVD_SUVD_CGC_CTRL, data2); }
@@ -724,6 +758,31 @@ static void uvd_v5_0_set_hw_clock_gating(struct amdgpu_device *adev) }#endif +static void uvd_v5_0_enable_mgcg (struct amdgpu_device *adev, +bool enable) +{ +u32 orig, data; + +if (enable && (adev->cg_flags &AMD_CG_SUPPORT_UVD_MGCG )) { + data =RREG32_UVD_CTX (ixUVD_CGC_MEM_CTRL); + data |=0xfff ; +WREG32_UVD_CTX (ixUVD_CGC_MEM_CTRL, data); + + orig = data =RREG32 (mmUVD_CGC_CTRL); + data |=UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK ; +if (orig != data) +WREG32 (mmUVD_CGC_CTRL, data); + }else { + data =RREG32_UVD_CTX (ixUVD_CGC_MEM_CTRL); + data &= ~0xfff ; +WREG32_UVD_CTX (ixUVD_CGC_MEM_CTRL, data); + + orig = data =RREG32 (mmUVD_CGC_CTRL); + data &= ~UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK ; +if (orig != data) +WREG32 (mmUVD_CGC_CTRL, data); + } +}static int uvd_v5_0_set_clockgating_state (void *handle,enum amd_clockgating_state state)
@@ -740,17 +799,18 @@ static int uvd_v5_0_set_clockgating_state(void *handle, curstate = state;if (enable) { -/* disable HW gating and enable Sw gating */ -uvd_v5_0_set_sw_clock_gating (adev); - }else {/* wait for STATUS to clear */ if (uvd_v5_0_wait_for_idle (handle))return -EBUSY ; +uvd_v5_0_enable_clock_gating (adev, true);/* enable HW gates because UVD is idle */ /* uvd_v5_0_set_hw_clock_gating(adev); */ + }else { +uvd_v5_0_enable_clock_gating (adev, false); } +uvd_v5_0_set_sw_clock_gating (adev);return 0 ; }
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/5 drm/amdgpu: refine uvd 6.0 clock gate feature.
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 112 ++++++++++++++++++++++++++++------ 1 file changed, 92 insertions(+), 20 deletions(-)
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +92 -20
@@ -42,6 +42,10 @@ static void uvd_v6_0_set_irq_funcs(struct amdgpu_device *adev);static int uvd_v6_0_start (struct amdgpu_device *adev);static void uvd_v6_0_stop (struct amdgpu_device *adev);static void uvd_v6_0_set_sw_clock_gating (struct amdgpu_device *adev); +static int uvd_v6_0_set_clockgating_state (void *handle, +enum amd_clockgating_state state); +static void uvd_v6_0_enable_mgcg (struct amdgpu_device *adev, +bool enable);/** * uvd_v6_0_ring_get_rptr - get read pointer
@@ -151,8 +155,6 @@ static int uvd_v6_0_hw_init(void *handle)uint32_t tmp;int r; -amdgpu_asic_set_uvd_clocks (adev,10000 ,10000 ); - r =uvd_v6_0_start (adev);if (r) goto done;
@@ -395,11 +397,11 @@ static int uvd_v6_0_start(struct amdgpu_device *adev) lmi_swap_cntl =0 ; mp_swap_cntl =0 ; +amdgpu_asic_set_uvd_clocks (adev,10000 ,10000 ); +uvd_v6_0_set_clockgating_state (adev,AMD_CG_STATE_UNGATE ); +uvd_v6_0_enable_mgcg (adev, true);uvd_v6_0_mc_resume (adev); -/* disable clock gating */ -WREG32_FIELD (UVD_CGC_CTRL ,DYN_CLOCK_MODE ,0 ); -/* disable interupt */ WREG32_FIELD (UVD_MASTINT_EN ,VCPU_EN ,0 );
@@ -838,22 +840,69 @@ static int uvd_v6_0_process_interrupt(struct amdgpu_device *adev,return 0 ; } +static void uvd_v6_0_enable_clock_gating (struct amdgpu_device *adev,bool enable) +{ +uint32_t data1, data3; + + data1 =RREG32 (mmUVD_SUVD_CGC_GATE); + data3 =RREG32 (mmUVD_CGC_GATE); + + data1 |=UVD_SUVD_CGC_GATE__SRE_MASK | +UVD_SUVD_CGC_GATE__SIT_MASK | +UVD_SUVD_CGC_GATE__SMP_MASK | +UVD_SUVD_CGC_GATE__SCM_MASK | +UVD_SUVD_CGC_GATE__SDB_MASK | +UVD_SUVD_CGC_GATE__SRE_H264_MASK | +UVD_SUVD_CGC_GATE__SRE_HEVC_MASK | +UVD_SUVD_CGC_GATE__SIT_H264_MASK | +UVD_SUVD_CGC_GATE__SIT_HEVC_MASK | +UVD_SUVD_CGC_GATE__SCM_H264_MASK | +UVD_SUVD_CGC_GATE__SCM_HEVC_MASK | +UVD_SUVD_CGC_GATE__SDB_H264_MASK | +UVD_SUVD_CGC_GATE__SDB_HEVC_MASK ; + +if (enable) { + data3 |= (UVD_CGC_GATE__SYS_MASK | +UVD_CGC_GATE__UDEC_MASK | +UVD_CGC_GATE__MPEG2_MASK | +UVD_CGC_GATE__RBC_MASK | +UVD_CGC_GATE__LMI_MC_MASK | +UVD_CGC_GATE__LMI_UMC_MASK | +UVD_CGC_GATE__IDCT_MASK | +UVD_CGC_GATE__MPRD_MASK | +UVD_CGC_GATE__MPC_MASK | +UVD_CGC_GATE__LBSI_MASK | +UVD_CGC_GATE__LRBBM_MASK | +UVD_CGC_GATE__UDEC_RE_MASK | +UVD_CGC_GATE__UDEC_CM_MASK | +UVD_CGC_GATE__UDEC_IT_MASK | +UVD_CGC_GATE__UDEC_DB_MASK | +UVD_CGC_GATE__UDEC_MP_MASK | +UVD_CGC_GATE__WCB_MASK | +UVD_CGC_GATE__VCPU_MASK | +UVD_CGC_GATE__JPEG_MASK | +UVD_CGC_GATE__SCPU_MASK | +UVD_CGC_GATE__JPEG2_MASK ); + data3 &= ~UVD_CGC_GATE__REGS_MASK ; + }else { + data3 =0 ; + } + +WREG32 (mmUVD_SUVD_CGC_GATE, data1); +WREG32 (mmUVD_CGC_GATE, data3); +} +static void uvd_v6_0_set_sw_clock_gating (struct amdgpu_device *adev) { -uint32_t data, data1, data2, suvd_flags; +uint32_t data, data2; data =RREG32 (mmUVD_CGC_CTRL); - data1 =RREG32 (mmUVD_SUVD_CGC_GATE); data2 =RREG32 (mmUVD_SUVD_CGC_CTRL); + data &= ~(UVD_CGC_CTRL__CLK_OFF_DELAY_MASK |UVD_CGC_CTRL__CLK_GATE_DLY_TIMER_MASK ); - suvd_flags =UVD_SUVD_CGC_GATE__SRE_MASK | -UVD_SUVD_CGC_GATE__SIT_MASK | -UVD_SUVD_CGC_GATE__SMP_MASK | -UVD_SUVD_CGC_GATE__SCM_MASK | -UVD_SUVD_CGC_GATE__SDB_MASK ; data |=UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK | (1 << REG_FIELD_SHIFT(UVD_CGC_CTRL, CLK_GATE_DLY_TIMER)) |
@@ -886,11 +935,8 @@ static void uvd_v6_0_set_sw_clock_gating(struct amdgpu_device *adev)UVD_SUVD_CGC_CTRL__SMP_MODE_MASK |UVD_SUVD_CGC_CTRL__SCM_MODE_MASK | UVD_SUVD_CGC_CTRL__SDB_MODE_MASK); - data1 |= suvd_flags;WREG32 (mmUVD_CGC_CTRL, data); -WREG32 (mmUVD_CGC_GATE,0 ); -WREG32 (mmUVD_SUVD_CGC_GATE, data1);WREG32 (mmUVD_SUVD_CGC_CTRL, data2); }
@@ -937,6 +983,32 @@ static void uvd_v6_0_set_hw_clock_gating(struct amdgpu_device *adev) }#endif +static void uvd_v6_0_enable_mgcg (struct amdgpu_device *adev, +bool enable) +{ +u32 orig, data; + +if (enable && (adev->cg_flags &AMD_CG_SUPPORT_UVD_MGCG )) { + data =RREG32_UVD_CTX (ixUVD_CGC_MEM_CTRL); + data |=0xfff ; +WREG32_UVD_CTX (ixUVD_CGC_MEM_CTRL, data); + + orig = data =RREG32 (mmUVD_CGC_CTRL); + data |=UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK ; +if (orig != data) +WREG32 (mmUVD_CGC_CTRL, data); + }else { + data =RREG32_UVD_CTX (ixUVD_CGC_MEM_CTRL); + data &= ~0xfff ; +WREG32_UVD_CTX (ixUVD_CGC_MEM_CTRL, data); + + orig = data =RREG32 (mmUVD_CGC_CTRL); + data &= ~UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK ; +if (orig != data) +WREG32 (mmUVD_CGC_CTRL, data); + } +} +static int uvd_v6_0_set_clockgating_state (void *handle,enum amd_clockgating_state state) {
@@ -947,17 +1019,17 @@ static int uvd_v6_0_set_clockgating_state(void *handle,return 0 ;if (enable) { -/* disable HW gating and enable Sw gating */ -uvd_v6_0_set_sw_clock_gating (adev); - }else {/* wait for STATUS to clear */ if (uvd_v6_0_wait_for_idle (handle))return -EBUSY ; - +uvd_v6_0_enable_clock_gating (adev, true);/* enable HW gates because UVD is idle */ /* uvd_v6_0_set_hw_clock_gating(adev); */ + }else { +/* disable HW gating and enable Sw gating */ +uvd_v6_0_enable_clock_gating (adev, false); } - +uvd_v6_0_set_sw_clock_gating (adev);return 0 ; }
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1478677305-12579-4-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org
Deucher, Alexander
Reviewed-by Alex DeucherRE: [PATCH 4/5] drm/amdgpu: refine uvd 6.0 clock gate feature.
Quoted 10 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Rex Zhu
Sent: Wednesday, November 09, 2016 2:42 AM
To: [email protected]
Cc: Zhu, Rex
Subject: [PATCH 4/5] drm/amdgpu: refine uvd 6.0 clock gate feature.Change-Id I3b665f26689dd35750e1a6521cd5fac5456f7556Signed-off-by Rex Zhu <[email protected]>
Can someone make sure this doesn't regress CZ and ST? As long as they are still ok, the patches 4, 5 are:
Quoted 202 lines
--- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 112 ++++++++++++++++++++++++++++------ 1 file changed, 92 insertions(+), 20 deletions(-)drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +4
-0@@ -42,6 +42,10 @@ static void uvd_v6_0_set_irq_funcs(struct amdgpu_device *adev);static int uvd_v6_0_start (struct amdgpu_device *adev);static void uvd_v6_0_stop (struct amdgpu_device *adev);static void uvd_v6_0_set_sw_clock_gating (struct amdgpu_device *adev); +static int uvd_v6_0_set_clockgating_state (void *handle, +enum amd_clockgating_state state); +static void uvd_v6_0_enable_mgcg (struct amdgpu_device *adev, +bool enable);/** *
uvd_v6_0_ring_get_rptr- get read pointerdrivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +57
-12@@ -151,8 +155,6 @@ static int uvd_v6_0_hw_init(void *handle)uint32_t tmp;int r; -amdgpu_asic_set_uvd_clocks (adev,10000 ,10000 ); - r =uvd_v6_0_start (adev);if (r) goto done;@@ -395,11 +397,11 @@ static int uvd_v6_0_start(struct amdgpu_device *adev) lmi_swap_cntl =0 ; mp_swap_cntl =0 ; +amdgpu_asic_set_uvd_clocks (adev,10000 ,10000 ); +uvd_v6_0_set_clockgating_state (adev,AMD_CG_STATE_UNGATE ); +uvd_v6_0_enable_mgcg (adev, true);uvd_v6_0_mc_resume (adev); -/* disable clock gating */ -WREG32_FIELD (UVD_CGC_CTRL ,DYN_CLOCK_MODE ,0 ); -/* disable interupt */ WREG32_FIELD (UVD_MASTINT_EN ,VCPU_EN ,0 );@@ -838,22 +840,69 @@ static int uvd_v6_0_process_interrupt(structamdgpu_device *adev, return 0; } +static void uvd_v6_0_enable_clock_gating (struct amdgpu_device *adev,bool enable) +{ +uint32_t data1, data3; + + data1 =RREG32 (mmUVD_SUVD_CGC_GATE); + data3 =RREG32 (mmUVD_CGC_GATE); + + data1 |=UVD_SUVD_CGC_GATE__SRE_MASK | +UVD_SUVD_CGC_GATE__SIT_MASK | +UVD_SUVD_CGC_GATE__SMP_MASK | +UVD_SUVD_CGC_GATE__SCM_MASK | +UVD_SUVD_CGC_GATE__SDB_MASK | +UVD_SUVD_CGC_GATE__SRE_H264_MASK | +UVD_SUVD_CGC_GATE__SRE_HEVC_MASK | +UVD_SUVD_CGC_GATE__SIT_H264_MASK | +UVD_SUVD_CGC_GATE__SIT_HEVC_MASK | +UVD_SUVD_CGC_GATE__SCM_H264_MASK | +UVD_SUVD_CGC_GATE__SCM_HEVC_MASK | +UVD_SUVD_CGC_GATE__SDB_H264_MASK | +UVD_SUVD_CGC_GATE__SDB_HEVC_MASK ; + +if (enable) { + data3 |= (UVD_CGC_GATE__SYS_MASK | +UVD_CGC_GATE__UDEC_MASK | +UVD_CGC_GATE__MPEG2_MASK | +UVD_CGC_GATE__RBC_MASK | +UVD_CGC_GATE__LMI_MC_MASK | +UVD_CGC_GATE__LMI_UMC_MASK | +UVD_CGC_GATE__IDCT_MASK | +UVD_CGC_GATE__MPRD_MASK | +UVD_CGC_GATE__MPC_MASK | +UVD_CGC_GATE__LBSI_MASK | +UVD_CGC_GATE__LRBBM_MASK | +UVD_CGC_GATE__UDEC_RE_MASK | +UVD_CGC_GATE__UDEC_CM_MASK | +UVD_CGC_GATE__UDEC_IT_MASK | +UVD_CGC_GATE__UDEC_DB_MASK | +UVD_CGC_GATE__UDEC_MP_MASK | +UVD_CGC_GATE__WCB_MASK | +UVD_CGC_GATE__VCPU_MASK | +UVD_CGC_GATE__JPEG_MASK | +UVD_CGC_GATE__SCPU_MASK | +UVD_CGC_GATE__JPEG2_MASK ); + data3 &= ~UVD_CGC_GATE__REGS_MASK ; + }else { + data3 =0 ; + } + +WREG32 (mmUVD_SUVD_CGC_GATE, data1); +WREG32 (mmUVD_CGC_GATE, data3); +} +static void uvd_v6_0_set_sw_clock_gating (struct amdgpu_device *adev) { -uint32_t data, data1, data2, suvd_flags; +uint32_t data, data2; data =RREG32 (mmUVD_CGC_CTRL); - data1 =RREG32 (mmUVD_SUVD_CGC_GATE); data2 =RREG32 (mmUVD_SUVD_CGC_CTRL); + data &= ~(UVD_CGC_CTRL__CLK_OFF_DELAY_MASK |UVD_CGC_CTRL__CLK_GATE_DLY_TIMER_MASK ); - suvd_flags =UVD_SUVD_CGC_GATE__SRE_MASK | -UVD_SUVD_CGC_GATE__SIT_MASK | -UVD_SUVD_CGC_GATE__SMP_MASK | -UVD_SUVD_CGC_GATE__SCM_MASK | -UVD_SUVD_CGC_GATE__SDB_MASK ;drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +0
-0data |=UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK | (1 << REG_FIELD_SHIFT(UVD_CGC_CTRL,
CLK_GATE_DLY_TIMER)) |drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +26
-3@@ -886,11 +935,8 @@ static void uvd_v6_0_set_sw_clock_gating(struct amdgpu_device *adev) UVD_SUVD_CGC_CTRL__SMP_MODE_MASK | UVD_SUVD_CGC_CTRL__SCM_MODE_MASK | UVD_SUVD_CGC_CTRL__SDB_MODE_MASK); - data1 |= suvd_flags;WREG32 (mmUVD_CGC_CTRL, data); -WREG32 (mmUVD_CGC_GATE,0 ); -WREG32 (mmUVD_SUVD_CGC_GATE, data1);WREG32 (mmUVD_SUVD_CGC_CTRL, data2); }@@ -937,6 +983,32 @@ static void uvd_v6_0_set_hw_clock_gating(struct amdgpu_device *adev) }#endif +static void uvd_v6_0_enable_mgcg (struct amdgpu_device *adev, +bool enable) +{ +u32 orig, data; + +if (enable && (adev->cg_flags &AMD_CG_SUPPORT_UVD_MGCG )) { + data =RREG32_UVD_CTX (ixUVD_CGC_MEM_CTRL); + data |=0xfff ; +WREG32_UVD_CTX (ixUVD_CGC_MEM_CTRL, data); + + orig = data =RREG32 (mmUVD_CGC_CTRL); + data |=UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK ; +if (orig != data) +WREG32 (mmUVD_CGC_CTRL, data); + }else { + data =RREG32_UVD_CTX (ixUVD_CGC_MEM_CTRL); + data &= ~0xfff ; +WREG32_UVD_CTX (ixUVD_CGC_MEM_CTRL, data); + + orig = data =RREG32 (mmUVD_CGC_CTRL); + data &= ~UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK ; +if (orig != data) +WREG32 (mmUVD_CGC_CTRL, data); + } +} + static int uvd_v6_0_set_clockgating_state(void *handle,drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +5
-6enum amd_clockgating_state state) {@@ -947,17 +1019,17 @@ static int uvd_v6_0_set_clockgating_state(void *handle, return 0;if (enable) { -/* disable HW gating and enable Sw gating */ -uvd_v6_0_set_sw_clock_gating (adev); - }else {/* wait for STATUS to clear */ if (uvd_v6_0_wait_for_idle (handle))return -EBUSY ; - +uvd_v6_0_enable_clock_gating (adev, true);/* enable HW gates because UVD is idle */ /* uvd_v6_0_set_hw_clock_gating(adev); */ + }else { +/* disable HW gating and enable Sw gating */ +uvd_v6_0_enable_clock_gating (adev, false); } - +uvd_v6_0_set_sw_clock_gating (adev);return 0 ; } --1.9.1
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): MWHPR12MB169470FE725F398CB38380C7F7B90-Gy0DoCVfaSW4WA4dJ5YXGAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
StDenis, Tom
Reviewed-by Alex DeucherRe: [PATCH 4/5] drm/amdgpu: refine uvd 6.0 clock gate feature.
Kinda buried trying to sort out the gfx6 boot failure but if someone can just email as an attachment the 5 patches I'll test them on my Stoney system (my CZ system is being used by the Tahiti board...)
Tom
________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Deucher, Alexander <[email protected]>
Sent: Wednesday, November 9, 2016 11:03
To: Zhu, Rex; [email protected]
Cc: Zhu, Rex
Subject: RE: [PATCH 4/5] drm/amdgpu: refine uvd 6.0 clock gate feature.
Quoted 10 lines
-----Original Message-----
From: amd-gfx [mailto:amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org] On Behalf Of Rex Zhu
Sent: Wednesday, November 09, 2016 2:42 AM
To: [email protected]
Cc: Zhu, Rex
Subject: [PATCH 4/5] drm/amdgpu: refine uvd 6.0 clock gate feature.Change-Id I3b665f26689dd35750e1a6521cd5fac5456f7556Signed-off-by Rex Zhu <[email protected]>
Can someone make sure this doesn't regress CZ and ST? As long as they are still ok, the patches 4, 5 are:
Quoted 202 lines
--- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 112 ++++++++++++++++++++++++++++------ 1 file changed, 92 insertions(+), 20 deletions(-)drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +4
-0@@ -42,6 +42,10 @@ static void uvd_v6_0_set_irq_funcs(struct amdgpu_device *adev);static int uvd_v6_0_start (struct amdgpu_device *adev);static void uvd_v6_0_stop (struct amdgpu_device *adev);static void uvd_v6_0_set_sw_clock_gating (struct amdgpu_device *adev); +static int uvd_v6_0_set_clockgating_state (void *handle, +enum amd_clockgating_state state); +static void uvd_v6_0_enable_mgcg (struct amdgpu_device *adev, +bool enable);/** *
uvd_v6_0_ring_get_rptr- get read pointerdrivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +57
-12@@ -151,8 +155,6 @@ static int uvd_v6_0_hw_init(void *handle)uint32_t tmp;int r; -amdgpu_asic_set_uvd_clocks (adev,10000 ,10000 ); - r =uvd_v6_0_start (adev);if (r) goto done;@@ -395,11 +397,11 @@ static int uvd_v6_0_start(struct amdgpu_device *adev) lmi_swap_cntl =0 ; mp_swap_cntl =0 ; +amdgpu_asic_set_uvd_clocks (adev,10000 ,10000 ); +uvd_v6_0_set_clockgating_state (adev,AMD_CG_STATE_UNGATE ); +uvd_v6_0_enable_mgcg (adev, true);uvd_v6_0_mc_resume (adev); -/* disable clock gating */ -WREG32_FIELD (UVD_CGC_CTRL ,DYN_CLOCK_MODE ,0 ); -/* disable interupt */ WREG32_FIELD (UVD_MASTINT_EN ,VCPU_EN ,0 );@@ -838,22 +840,69 @@ static int uvd_v6_0_process_interrupt(structamdgpu_device *adev, return 0; } +static void uvd_v6_0_enable_clock_gating (struct amdgpu_device *adev,bool enable) +{ +uint32_t data1, data3; + + data1 =RREG32 (mmUVD_SUVD_CGC_GATE); + data3 =RREG32 (mmUVD_CGC_GATE); + + data1 |=UVD_SUVD_CGC_GATE__SRE_MASK | +UVD_SUVD_CGC_GATE__SIT_MASK | +UVD_SUVD_CGC_GATE__SMP_MASK | +UVD_SUVD_CGC_GATE__SCM_MASK | +UVD_SUVD_CGC_GATE__SDB_MASK | +UVD_SUVD_CGC_GATE__SRE_H264_MASK | +UVD_SUVD_CGC_GATE__SRE_HEVC_MASK | +UVD_SUVD_CGC_GATE__SIT_H264_MASK | +UVD_SUVD_CGC_GATE__SIT_HEVC_MASK | +UVD_SUVD_CGC_GATE__SCM_H264_MASK | +UVD_SUVD_CGC_GATE__SCM_HEVC_MASK | +UVD_SUVD_CGC_GATE__SDB_H264_MASK | +UVD_SUVD_CGC_GATE__SDB_HEVC_MASK ; + +if (enable) { + data3 |= (UVD_CGC_GATE__SYS_MASK | +UVD_CGC_GATE__UDEC_MASK | +UVD_CGC_GATE__MPEG2_MASK | +UVD_CGC_GATE__RBC_MASK | +UVD_CGC_GATE__LMI_MC_MASK | +UVD_CGC_GATE__LMI_UMC_MASK | +UVD_CGC_GATE__IDCT_MASK | +UVD_CGC_GATE__MPRD_MASK | +UVD_CGC_GATE__MPC_MASK | +UVD_CGC_GATE__LBSI_MASK | +UVD_CGC_GATE__LRBBM_MASK | +UVD_CGC_GATE__UDEC_RE_MASK | +UVD_CGC_GATE__UDEC_CM_MASK | +UVD_CGC_GATE__UDEC_IT_MASK | +UVD_CGC_GATE__UDEC_DB_MASK | +UVD_CGC_GATE__UDEC_MP_MASK | +UVD_CGC_GATE__WCB_MASK | +UVD_CGC_GATE__VCPU_MASK | +UVD_CGC_GATE__JPEG_MASK | +UVD_CGC_GATE__SCPU_MASK | +UVD_CGC_GATE__JPEG2_MASK ); + data3 &= ~UVD_CGC_GATE__REGS_MASK ; + }else { + data3 =0 ; + } + +WREG32 (mmUVD_SUVD_CGC_GATE, data1); +WREG32 (mmUVD_CGC_GATE, data3); +} +static void uvd_v6_0_set_sw_clock_gating (struct amdgpu_device *adev) { -uint32_t data, data1, data2, suvd_flags; +uint32_t data, data2; data =RREG32 (mmUVD_CGC_CTRL); - data1 =RREG32 (mmUVD_SUVD_CGC_GATE); data2 =RREG32 (mmUVD_SUVD_CGC_CTRL); + data &= ~(UVD_CGC_CTRL__CLK_OFF_DELAY_MASK |UVD_CGC_CTRL__CLK_GATE_DLY_TIMER_MASK ); - suvd_flags =UVD_SUVD_CGC_GATE__SRE_MASK | -UVD_SUVD_CGC_GATE__SIT_MASK | -UVD_SUVD_CGC_GATE__SMP_MASK | -UVD_SUVD_CGC_GATE__SCM_MASK | -UVD_SUVD_CGC_GATE__SDB_MASK ;data |= UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK | (1 << REG_FIELD_SHIFT(UVD_CGC_CTRL,
CLK_GATE_DLY_TIMER)) |drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +26
-3@@ -886,11 +935,8 @@ static void uvd_v6_0_set_sw_clock_gating(struct amdgpu_device *adev) UVD_SUVD_CGC_CTRL__SMP_MODE_MASK | UVD_SUVD_CGC_CTRL__SCM_MODE_MASK | UVD_SUVD_CGC_CTRL__SDB_MODE_MASK); - data1 |= suvd_flags;WREG32 (mmUVD_CGC_CTRL, data); -WREG32 (mmUVD_CGC_GATE,0 ); -WREG32 (mmUVD_SUVD_CGC_GATE, data1);WREG32 (mmUVD_SUVD_CGC_CTRL, data2); }@@ -937,6 +983,32 @@ static void uvd_v6_0_set_hw_clock_gating(struct amdgpu_device *adev) }#endif +static void uvd_v6_0_enable_mgcg (struct amdgpu_device *adev, +bool enable) +{ +u32 orig, data; + +if (enable && (adev->cg_flags &AMD_CG_SUPPORT_UVD_MGCG )) { + data =RREG32_UVD_CTX (ixUVD_CGC_MEM_CTRL); + data |=0xfff ; +WREG32_UVD_CTX (ixUVD_CGC_MEM_CTRL, data); + + orig = data =RREG32 (mmUVD_CGC_CTRL); + data |=UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK ; +if (orig != data) +WREG32 (mmUVD_CGC_CTRL, data); + }else { + data =RREG32_UVD_CTX (ixUVD_CGC_MEM_CTRL); + data &= ~0xfff ; +WREG32_UVD_CTX (ixUVD_CGC_MEM_CTRL, data); + + orig = data =RREG32 (mmUVD_CGC_CTRL); + data &= ~UVD_CGC_CTRL__DYN_CLOCK_MODE_MASK ; +if (orig != data) +WREG32 (mmUVD_CGC_CTRL, data); + } +} + static int uvd_v6_0_set_clockgating_state(void *handle,enum
amd_clockgating_statestate)
{drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +5
-6@@ -947,17 +1019,17 @@ static int uvd_v6_0_set_clockgating_state(void *handle, return 0;if (enable) { -/* disable HW gating and enable Sw gating */ -uvd_v6_0_set_sw_clock_gating (adev); - }else {/* wait for STATUS to clear */ if (uvd_v6_0_wait_for_idle (handle))return -EBUSY ; - +uvd_v6_0_enable_clock_gating (adev, true);/* enable HW gates because UVD is idle */ /* uvd_v6_0_set_hw_clock_gating(adev); */ + }else { +/* disable HW gating and enable Sw gating */ +uvd_v6_0_enable_clock_gating (adev, false); } - +uvd_v6_0_set_sw_clock_gating (adev);return 0 ; } --1.9.1
Quoted 4 lines
_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/5 drm/amdgpu: enable uvd mgcg for Fiji.
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/vi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/vi.c +2 -1
@@ -927,7 +927,8 @@ static int vi_common_early_init(void *handle)AMD_CG_SUPPORT_HDP_LS |AMD_CG_SUPPORT_ROM_MGCG |AMD_CG_SUPPORT_MC_MGCG | -AMD_CG_SUPPORT_MC_LS ; +AMD_CG_SUPPORT_MC_LS | +AMD_CG_SUPPORT_UVD_MGCG ; adev->pg_flags =0 ; adev->external_rev_id = adev->rev_id +0x3c ;break ;
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx