drm/amd/pm: update the smu driver interface version for SMU IP v13.0.4
Subsystems (3)
PATCH 1/7 drm/amd/pm: update the smu driver interface version for SMU IP v13.0.4
The pmfw has changed the driver interface version, so keep same with the fw.
--- drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h +1 -1
@@ -28,7 +28,7 @@#define SMU13_DRIVER_IF_VERSION_INV 0xFFFFFFFF#define SMU13_DRIVER_IF_VERSION_YELLOW_CARP 0x04#define SMU13_DRIVER_IF_VERSION_ALDE 0x08 -#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_4 0x04 +#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_4 0x05#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_5 0x04#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_0 0x2C#define SMU13_DRIVER_IF_VERSION_SMU_V13_0_7 0x2C
Signature · 1 line
2.25.1
PATCH 2/7 drm/amdgpu: add MMHUB IP v3.0.1 Clock Gating support
Add set/get_clockgating for MMHUB IP v3.0.1.
--- drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c | 42 +++++++++++++++++++++-- 1 file changed, 39 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c +39 -3
@@ -518,18 +518,41 @@ static u64 mmhub_v3_0_1_get_mc_fb_offset(struct amdgpu_device *adev)static void mmhub_v3_0_1_update_medium_grain_clock_gating (struct amdgpu_device *adev,bool enable) { -//TODO +uint32_t def, data; + + def = data =RREG32_SOC15 (MMHUB ,0 , regMM_ATC_L2_MISC_CG); + +if (enable) + data |=MM_ATC_L2_MISC_CG__ENABLE_MASK ; +else + data &= ~MM_ATC_L2_MISC_CG__ENABLE_MASK ; + +if (def != data) +WREG32_SOC15 (MMHUB ,0 , regMM_ATC_L2_MISC_CG, data); }static void mmhub_v3_0_1_update_medium_grain_light_sleep (struct amdgpu_device *adev,bool enable) { -//TODO +uint32_t def, data; + + def = data =RREG32_SOC15 (MMHUB ,0 , regMM_ATC_L2_MISC_CG); + +if (enable) + data |=MM_ATC_L2_MISC_CG__MEM_LS_ENABLE_MASK ; +else + data &= ~MM_ATC_L2_MISC_CG__MEM_LS_ENABLE_MASK ; + +if (def != data) +WREG32_SOC15 (MMHUB ,0 , regMM_ATC_L2_MISC_CG, data); }static int mmhub_v3_0_1_set_clockgating (struct amdgpu_device *adev,enum amd_clockgating_state state) { +if (amdgpu_sriov_vf (adev)) +return 0 ; +mmhub_v3_0_1_update_medium_grain_clock_gating (adev, state ==AMD_CG_STATE_GATE ); mmhub_v3_0_1_update_medium_grain_light_sleep(adev,
@@ -539,7 +562,20 @@ static int mmhub_v3_0_1_set_clockgating(struct amdgpu_device *adev,static void mmhub_v3_0_1_get_clockgating (struct amdgpu_device *adev,u64 *flags) { -//TODO +int data; + +if (amdgpu_sriov_vf (adev)) + *flags =0 ; + + data =RREG32_SOC15 (MMHUB ,0 , regMM_ATC_L2_MISC_CG); + +/* AMD_CG_SUPPORT_MC_MGCG */ +if (data &MM_ATC_L2_MISC_CG__ENABLE_MASK ) + *flags |=AMD_CG_SUPPORT_MC_MGCG ; + +/* AMD_CG_SUPPORT_MC_LS */ +if (data &MM_ATC_L2_MISC_CG__MEM_LS_ENABLE_MASK ) + *flags |=AMD_CG_SUPPORT_MC_LS ; }const struct amdgpu_mmhub_funcs mmhub_v3_0_1_funcs = {
Signature · 1 line
2.25.1
PATCH 3/7 drm/amdgpu: add HDP IP v5.2.1 Clock Gating support
In reply to Tim HuangAdd set/get_clockgating for HDP IP v5.2.1.
--- drivers/gpu/drm/amd/amdgpu/hdp_v5_2.c | 150 ++++++++++++++++++++++++++ 1 file changed, 150 insertions(+)
drivers/gpu/drm/amd/amdgpu/hdp_v5_2.c +150 -0
@@ -40,6 +40,156 @@ static void hdp_v5_2_flush_hdp(struct amdgpu_device *adev, 0); } +static void hdp_v5_2_update_mem_power_gating (struct amdgpu_device *adev, +bool enable) +{ +uint32_t hdp_clk_cntl; +uint32_t hdp_mem_pwr_cntl; + +if (!(adev->cg_flags & (AMD_CG_SUPPORT_HDP_LS | +AMD_CG_SUPPORT_HDP_DS | +AMD_CG_SUPPORT_HDP_SD ))) +return ; + + hdp_clk_cntl =RREG32_SOC15 (HDP ,0 , regHDP_CLK_CNTL); + hdp_mem_pwr_cntl =RREG32_SOC15 (HDP ,0 , regHDP_MEM_POWER_CTRL); + +/* Before doing clock/power mode switch, forced on MEM clock */ + hdp_clk_cntl =REG_SET_FIELD (hdp_clk_cntl,HDP_CLK_CNTL , +ATOMIC_MEM_CLK_SOFT_OVERRIDE ,1 ); + hdp_clk_cntl =REG_SET_FIELD (hdp_clk_cntl,HDP_CLK_CNTL , +RC_MEM_CLK_SOFT_OVERRIDE ,1 ); +WREG32_SOC15 (HDP ,0 , regHDP_CLK_CNTL, hdp_clk_cntl); + +/* disable clock and power gating before any changing */ + hdp_mem_pwr_cntl =REG_SET_FIELD (hdp_mem_pwr_cntl,HDP_MEM_POWER_CTRL , +ATOMIC_MEM_POWER_CTRL_EN ,0 ); + hdp_mem_pwr_cntl =REG_SET_FIELD (hdp_mem_pwr_cntl,HDP_MEM_POWER_CTRL , +ATOMIC_MEM_POWER_LS_EN ,0 ); + hdp_mem_pwr_cntl =REG_SET_FIELD (hdp_mem_pwr_cntl,HDP_MEM_POWER_CTRL , +ATOMIC_MEM_POWER_DS_EN ,0 ); + hdp_mem_pwr_cntl =REG_SET_FIELD (hdp_mem_pwr_cntl,HDP_MEM_POWER_CTRL , +ATOMIC_MEM_POWER_SD_EN ,0 ); + hdp_mem_pwr_cntl =REG_SET_FIELD (hdp_mem_pwr_cntl,HDP_MEM_POWER_CTRL , +RC_MEM_POWER_CTRL_EN ,0 ); + hdp_mem_pwr_cntl =REG_SET_FIELD (hdp_mem_pwr_cntl,HDP_MEM_POWER_CTRL , +RC_MEM_POWER_LS_EN ,0 ); + hdp_mem_pwr_cntl =REG_SET_FIELD (hdp_mem_pwr_cntl,HDP_MEM_POWER_CTRL , +RC_MEM_POWER_DS_EN ,0 ); + hdp_mem_pwr_cntl =REG_SET_FIELD (hdp_mem_pwr_cntl,HDP_MEM_POWER_CTRL , +RC_MEM_POWER_SD_EN ,0 ); +WREG32_SOC15 (HDP ,0 , regHDP_MEM_POWER_CTRL, hdp_mem_pwr_cntl); + +/* Already disabled above. The actions below are for "enabled" only */ +if (enable) { +/* only one clock gating mode (LS/DS/SD) can be enabled */ +if (adev->cg_flags &AMD_CG_SUPPORT_HDP_SD ) { + hdp_mem_pwr_cntl =REG_SET_FIELD (hdp_mem_pwr_cntl, +HDP_MEM_POWER_CTRL , +ATOMIC_MEM_POWER_SD_EN ,1 ); + hdp_mem_pwr_cntl =REG_SET_FIELD (hdp_mem_pwr_cntl, +HDP_MEM_POWER_CTRL , +RC_MEM_POWER_SD_EN ,1 ); + }else if (adev->cg_flags &AMD_CG_SUPPORT_HDP_LS ) { + hdp_mem_pwr_cntl =REG_SET_FIELD (hdp_mem_pwr_cntl, +HDP_MEM_POWER_CTRL , +ATOMIC_MEM_POWER_LS_EN ,1 ); + hdp_mem_pwr_cntl =REG_SET_FIELD (hdp_mem_pwr_cntl, +HDP_MEM_POWER_CTRL , +RC_MEM_POWER_LS_EN ,1 ); + }else if (adev->cg_flags &AMD_CG_SUPPORT_HDP_DS ) { + hdp_mem_pwr_cntl =REG_SET_FIELD (hdp_mem_pwr_cntl, +HDP_MEM_POWER_CTRL , +ATOMIC_MEM_POWER_DS_EN ,1 ); + hdp_mem_pwr_cntl =REG_SET_FIELD (hdp_mem_pwr_cntl, +HDP_MEM_POWER_CTRL , +RC_MEM_POWER_DS_EN ,1 ); + } + +/* confirmed that ATOMIC/RC_MEM_POWER_CTRL_EN have to be set for SRAM LS/DS/SD */ +if (adev->cg_flags & (AMD_CG_SUPPORT_HDP_LS |AMD_CG_SUPPORT_HDP_DS | +AMD_CG_SUPPORT_HDP_SD )) { + hdp_mem_pwr_cntl =REG_SET_FIELD (hdp_mem_pwr_cntl,HDP_MEM_POWER_CTRL , +ATOMIC_MEM_POWER_CTRL_EN ,1 ); + hdp_mem_pwr_cntl =REG_SET_FIELD (hdp_mem_pwr_cntl,HDP_MEM_POWER_CTRL , +RC_MEM_POWER_CTRL_EN ,1 ); +WREG32_SOC15 (HDP ,0 , regHDP_MEM_POWER_CTRL, hdp_mem_pwr_cntl); + } + } + +/* disable MEM clock override after clock/power mode changing */ + hdp_clk_cntl =REG_SET_FIELD (hdp_clk_cntl,HDP_CLK_CNTL , +ATOMIC_MEM_CLK_SOFT_OVERRIDE ,0 ); + hdp_clk_cntl =REG_SET_FIELD (hdp_clk_cntl,HDP_CLK_CNTL , +RC_MEM_CLK_SOFT_OVERRIDE ,0 ); +WREG32_SOC15 (HDP ,0 , regHDP_CLK_CNTL, hdp_clk_cntl); +} + +static void hdp_v5_2_update_medium_grain_clock_gating (struct amdgpu_device *adev, +bool enable) +{ +uint32_t hdp_clk_cntl; + +if (!(adev->cg_flags &AMD_CG_SUPPORT_HDP_MGCG )) +return ; + + hdp_clk_cntl =RREG32_SOC15 (HDP ,0 , regHDP_CLK_CNTL); + +if (enable) { + hdp_clk_cntl &= + ~(uint32_t ) + (HDP_CLK_CNTL__ATOMIC_MEM_CLK_SOFT_OVERRIDE_MASK | +HDP_CLK_CNTL__RC_MEM_CLK_SOFT_OVERRIDE_MASK | +HDP_CLK_CNTL__DBUS_CLK_SOFT_OVERRIDE_MASK | +HDP_CLK_CNTL__DYN_CLK_SOFT_OVERRIDE_MASK | +HDP_CLK_CNTL__XDP_REG_CLK_SOFT_OVERRIDE_MASK | +HDP_CLK_CNTL__HDP_REG_CLK_SOFT_OVERRIDE_MASK ); + }else { + hdp_clk_cntl |=HDP_CLK_CNTL__ATOMIC_MEM_CLK_SOFT_OVERRIDE_MASK | +HDP_CLK_CNTL__RC_MEM_CLK_SOFT_OVERRIDE_MASK | +HDP_CLK_CNTL__DBUS_CLK_SOFT_OVERRIDE_MASK | +HDP_CLK_CNTL__DYN_CLK_SOFT_OVERRIDE_MASK | +HDP_CLK_CNTL__XDP_REG_CLK_SOFT_OVERRIDE_MASK | +HDP_CLK_CNTL__HDP_REG_CLK_SOFT_OVERRIDE_MASK ; + } + +WREG32_SOC15 (HDP ,0 , regHDP_CLK_CNTL, hdp_clk_cntl); +} + +static void hdp_v5_2_get_clockgating_state (struct amdgpu_device *adev, +u64 *flags) +{ +uint32_t tmp; + +/* AMD_CG_SUPPORT_HDP_MGCG */ + tmp =RREG32_SOC15 (HDP ,0 , regHDP_CLK_CNTL); +if (!(tmp & (HDP_CLK_CNTL__ATOMIC_MEM_CLK_SOFT_OVERRIDE_MASK | +HDP_CLK_CNTL__RC_MEM_CLK_SOFT_OVERRIDE_MASK | +HDP_CLK_CNTL__DBUS_CLK_SOFT_OVERRIDE_MASK | +HDP_CLK_CNTL__DYN_CLK_SOFT_OVERRIDE_MASK | +HDP_CLK_CNTL__XDP_REG_CLK_SOFT_OVERRIDE_MASK | +HDP_CLK_CNTL__HDP_REG_CLK_SOFT_OVERRIDE_MASK ))) + *flags |=AMD_CG_SUPPORT_HDP_MGCG ; + +/* AMD_CG_SUPPORT_HDP_LS/DS/SD */ + tmp =RREG32_SOC15 (HDP ,0 , regHDP_MEM_POWER_CTRL); +if (tmp &HDP_MEM_POWER_CTRL__ATOMIC_MEM_POWER_LS_EN_MASK ) + *flags |=AMD_CG_SUPPORT_HDP_LS ; +else if (tmp &HDP_MEM_POWER_CTRL__ATOMIC_MEM_POWER_DS_EN_MASK ) + *flags |=AMD_CG_SUPPORT_HDP_DS ; +else if (tmp &HDP_MEM_POWER_CTRL__ATOMIC_MEM_POWER_SD_EN_MASK ) + *flags |=AMD_CG_SUPPORT_HDP_SD ; +} + +static void hdp_v5_2_update_clock_gating (struct amdgpu_device *adev, +bool enable) +{ +hdp_v5_2_update_mem_power_gating (adev, enable); +hdp_v5_2_update_medium_grain_clock_gating (adev, enable); +} +const struct amdgpu_hdp_funcs hdp_v5_2_funcs = { .flush_hdp = hdp_v5_2_flush_hdp, + .update_clock_gating = hdp_v5_2_update_clock_gating, + .get_clock_gating_state = hdp_v5_2_get_clockgating_state, };
Signature · 1 line
2.25.1
PATCH 4/7 drm/amdgpu: add ATHUB IP v3.0.1 Clock Gating support
In reply to Tim HuangAdd ATHUB IP v3.0.1 in athub_v3_0_set_clockgating.
The regATHUB_MISC_CNTL has different offset for ATHUB IP v3.0.1, so need to add IP version checking to use the right REG offset.
--- drivers/gpu/drm/amd/amdgpu/athub_v3_0.c | 42 ++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/athub_v3_0.c +37 -5
@@ -28,13 +28,44 @@#include "navi10_enum.h" #include "soc15_common.h" +#define regATHUB_MISC_CNTL_V3_0_1 0x00d7 +#define regATHUB_MISC_CNTL_V3_0_1_BASE_IDX 0 + + +static uint32_t athub_v3_0_get_cg_cntl (struct amdgpu_device *adev) +{ +uint32_t data; + +switch (adev->ip_versions[ATHUB_HWIP ][0 ]) { +case IP_VERSION (3 ,0 ,1 ): + data =RREG32_SOC15 (ATHUB ,0 , regATHUB_MISC_CNTL_V3_0_1); +break ; +default : + data =RREG32_SOC15 (ATHUB ,0 , regATHUB_MISC_CNTL); +break ; + } +return data; +} + +static void athub_v3_0_set_cg_cntl (struct amdgpu_device *adev,uint32_t data) +{ +switch (adev->ip_versions[ATHUB_HWIP ][0 ]) { +case IP_VERSION (3 ,0 ,1 ): +WREG32_SOC15 (ATHUB ,0 , regATHUB_MISC_CNTL_V3_0_1, data); +break ; +default : +WREG32_SOC15 (ATHUB ,0 , regATHUB_MISC_CNTL, data); +break ; + } +} +static void athub_v3_0_update_medium_grain_clock_gating (struct amdgpu_device *adev,bool enable) {uint32_t def, data; - def = data =RREG32_SOC15 (ATHUB ,0 , regATHUB_MISC_CNTL); + def = data =athub_v3_0_get_cg_cntl (adev);if (enable && (adev->cg_flags &AMD_CG_SUPPORT_ATHUB_MGCG )) data |=ATHUB_MISC_CNTL__CG_ENABLE_MASK ;
@@ -42,7 +73,7 @@ athub_v3_0_update_medium_grain_clock_gating(struct amdgpu_device *adev, data &= ~ATHUB_MISC_CNTL__CG_ENABLE_MASK ;if (def != data) -WREG32_SOC15 (ATHUB ,0 , regATHUB_MISC_CNTL, data); +athub_v3_0_set_cg_cntl (adev, data); } static void
@@ -51,7 +82,7 @@ athub_v3_0_update_medium_grain_light_sleep(struct amdgpu_device *adev, {uint32_t def, data; - def = data =RREG32_SOC15 (ATHUB ,0 , regATHUB_MISC_CNTL); + def = data =athub_v3_0_get_cg_cntl (adev);if (enable && (adev->cg_flags &AMD_CG_SUPPORT_ATHUB_LS )) data |=ATHUB_MISC_CNTL__CG_MEM_LS_ENABLE_MASK ;
@@ -59,7 +90,7 @@ athub_v3_0_update_medium_grain_light_sleep(struct amdgpu_device *adev, data &= ~ATHUB_MISC_CNTL__CG_MEM_LS_ENABLE_MASK ;if (def != data) -WREG32_SOC15 (ATHUB ,0 , regATHUB_MISC_CNTL, data); +athub_v3_0_set_cg_cntl (adev, data); } int athub_v3_0_set_clockgating(struct amdgpu_device *adev,
@@ -70,6 +101,7 @@ int athub_v3_0_set_clockgating(struct amdgpu_device *adev,switch (adev->ip_versions[ATHUB_HWIP ][0 ]) {case IP_VERSION (3 ,0 ,0 ): +case IP_VERSION (3 ,0 ,1 ):case IP_VERSION (3 ,0 ,2 ):athub_v3_0_update_medium_grain_clock_gating (adev, state ==AMD_CG_STATE_GATE );
@@ -88,7 +120,7 @@ void athub_v3_0_get_clockgating(struct amdgpu_device *adev, u64 *flags)int data;/* AMD_CG_SUPPORT_ATHUB_MGCG */ - data =RREG32_SOC15 (ATHUB ,0 , regATHUB_MISC_CNTL); + data =athub_v3_0_get_cg_cntl (adev);if (data &ATHUB_MISC_CNTL__CG_ENABLE_MASK ) *flags |=AMD_CG_SUPPORT_ATHUB_MGCG ;
Signature · 1 line
2.25.1
PATCH 5/7 drm/amdgpu: enable MMHUB IP v3.0.1 Clock Gating
In reply to Tim HuangEnable AMD_CG_SUPPORT_MC_MGCG and AMD_CG_SUPPORT_MC_LS support.
--- drivers/gpu/drm/amd/amdgpu/soc21.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/soc21.c +2 -0
@@ -596,6 +596,8 @@ static int soc21_common_early_init(void *handle)AMD_CG_SUPPORT_GFX_FGCG |AMD_CG_SUPPORT_REPEATER_FGCG |AMD_CG_SUPPORT_GFX_PERF_CLK | +AMD_CG_SUPPORT_MC_MGCG | +AMD_CG_SUPPORT_MC_LS |AMD_CG_SUPPORT_VCN_MGCG |AMD_CG_SUPPORT_JPEG_MGCG ; adev->pg_flags =
Signature · 1 line
2.25.1
PATCH 6/7 drm/amdgpu: enable HDP IP v5.2.1 Clock Gating
In reply to Tim HuangEnable AMD_CG_SUPPORT_HDP_MGCG and AMD_CG_SUPPORT_HDP_LS support.
--- drivers/gpu/drm/amd/amdgpu/soc21.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/amd/amdgpu/soc21.c +6 -0
@@ -598,6 +598,8 @@ static int soc21_common_early_init(void *handle)AMD_CG_SUPPORT_GFX_PERF_CLK |AMD_CG_SUPPORT_MC_MGCG |AMD_CG_SUPPORT_MC_LS | +AMD_CG_SUPPORT_HDP_MGCG | +AMD_CG_SUPPORT_HDP_LS |AMD_CG_SUPPORT_VCN_MGCG |AMD_CG_SUPPORT_JPEG_MGCG ; adev->pg_flags =
@@ -704,6 +706,10 @@ static int soc21_common_set_clockgating_state(void *handle, adev->hdp.funcs->update_clock_gating (adev, state ==AMD_CG_STATE_GATE );break ; +case IP_VERSION (7 ,7 ,0 ): + adev->hdp.funcs->update_clock_gating (adev, + state ==AMD_CG_STATE_GATE ); +break ;default :break ; }
Signature · 1 line
2.25.1
PATCH 7/7 drm/amdgpu: enable ATHUB IP v3.0.1 Clock Gating
In reply to Tim HuangEnable AMD_CG_SUPPORT_ATHUB_MGCG and AMD_CG_SUPPORT_ATHUB_LS support.
--- drivers/gpu/drm/amd/amdgpu/soc21.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/soc21.c +2 -0
@@ -600,6 +600,8 @@ static int soc21_common_early_init(void *handle)AMD_CG_SUPPORT_MC_LS |AMD_CG_SUPPORT_HDP_MGCG |AMD_CG_SUPPORT_HDP_LS | +AMD_CG_SUPPORT_ATHUB_MGCG | +AMD_CG_SUPPORT_ATHUB_LS |AMD_CG_SUPPORT_VCN_MGCG |AMD_CG_SUPPORT_JPEG_MGCG ; adev->pg_flags =
Signature · 1 line
2.25.1
Re: [PATCH 7/7] drm/amdgpu: enable ATHUB IP v3.0.1 Clock Gating
[Public]
Series is:
________________________________
From: Huang, Tim <[email protected]>
Sent: Thursday, August 11, 2022 12:58 AM
To: [email protected] <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Zhang, Yifan <[email protected]>; Du, Xiaojian <[email protected]>; Huang, Tim <[email protected]>
Subject: [PATCH 7/7] drm/amdgpu: enable ATHUB IP v3.0.1 Clock Gating
Enable AMD_CG_SUPPORT_ATHUB_MGCG and AMD_CG_SUPPORT_ATHUB_LS support.
--- drivers/gpu/drm/amd/amdgpu/soc21.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/soc21.c +2 -0
@@ -600,6 +600,8 @@ static int soc21_common_early_init(void *handle)AMD_CG_SUPPORT_MC_LS |AMD_CG_SUPPORT_HDP_MGCG |AMD_CG_SUPPORT_HDP_LS | +AMD_CG_SUPPORT_ATHUB_MGCG | +AMD_CG_SUPPORT_ATHUB_LS |AMD_CG_SUPPORT_VCN_MGCG |AMD_CG_SUPPORT_JPEG_MGCG ; adev->pg_flags =
--
2.25.1