drm/amdgpu: enable mmhub power pate for renoir
Subsystems (2)
PATCH 1/2 drm/amdgpu: enable mmhub power pate for renoir
From: changzhu <[email protected]>
mmhub power gate structure is changed in renoir compared with raven. It goes through smu_dpm_set_power_gate other than adev->powerplay.pp_funcs->set_powergating_by_smu in renoir.
So we can realize mmhub power gate insmu_dpm_set_power_gate ->smu_powergate_mmhub ->powergate_mmhub ->smu_v12_0_powergate_mmhub
Change-Id I3e1b5ab96f7824abb82b16232dba0a263caeaaa8
Signed-off-by changzhu <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 10 ++++++---- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 1 + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 3 +-- drivers/gpu/drm/amd/amdgpu/soc15.c | 3 ++- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 3 +++ drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 1 + drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h | 2 ++ drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 1 + drivers/gpu/drm/amd/powerplay/smu_internal.h | 2 ++ drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 6 ++++++ 10 files changed, 25 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c +6 -4
@@ -954,15 +954,17 @@ int amdgpu_dpm_set_powergating_by_smu(struct amdgpu_device *adev, uint32_t blockcase AMD_IP_BLOCK_TYPE_VCN :case AMD_IP_BLOCK_TYPE_VCE :case AMD_IP_BLOCK_TYPE_SDMA : +case AMD_IP_BLOCK_TYPE_GMC :if (swsmu) ret =smu_dpm_set_power_gate (&adev->smu, block_type, gate);else - ret = ((adev)->powerplay.pp_funcs->set_powergating_by_smu ( - (adev)->powerplay.pp_handle, block_type, gate)); +if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->set_powergating_by_smu) + ret = ((adev)->powerplay.pp_funcs->set_powergating_by_smu ( + (adev)->powerplay.pp_handle, block_type, gate));break ; -case AMD_IP_BLOCK_TYPE_GMC :case AMD_IP_BLOCK_TYPE_ACP : - ret = ((adev)->powerplay.pp_funcs->set_powergating_by_smu ( +if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->set_powergating_by_smu) + ret = ((adev)->powerplay.pp_funcs->set_powergating_by_smu ( (adev)->powerplay.pp_handle, block_type, gate));break ;default :
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +1 -0
@@ -1202,6 +1202,7 @@ static int gmc_v9_0_hw_init(void *handle)switch (adev->asic_type) {case CHIP_RAVEN : +case CHIP_RENOIR :/* TODO for renoir */ mmhub_v1_0_update_power_gating (adev, true);break ;
drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +1 -2
@@ -301,8 +301,7 @@ void mmhub_v1_0_update_power_gating(struct amdgpu_device *adev,return ;if (enable && adev->pg_flags &AMD_PG_SUPPORT_MMHUB ) { -if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->set_powergating_by_smu) -amdgpu_dpm_set_powergating_by_smu (adev,AMD_IP_BLOCK_TYPE_GMC , true); +amdgpu_dpm_set_powergating_by_smu (adev,AMD_IP_BLOCK_TYPE_GMC , true); } }
drivers/gpu/drm/amd/amdgpu/soc15.c +2 -1
@@ -1234,7 +1234,8 @@ static int soc15_common_early_init(void *handle)AMD_CG_SUPPORT_DF_MGCG ; adev->pg_flags =AMD_PG_SUPPORT_SDMA |AMD_PG_SUPPORT_VCN | -AMD_PG_SUPPORT_VCN_DPG ; +AMD_PG_SUPPORT_VCN_DPG | +AMD_PG_SUPPORT_MMHUB ; adev->external_rev_id = adev->rev_id +0x91 ;break ;default :
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +3 -0
@@ -415,6 +415,9 @@ int smu_dpm_set_power_gate(struct smu_context *smu, uint32_t block_type,case AMD_IP_BLOCK_TYPE_SDMA : ret =smu_powergate_sdma (smu, gate);break ; +case AMD_IP_BLOCK_TYPE_GMC : + ret =smu_powergate_mmhub (smu); +break ;default :break ; }
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +1 -0
@@ -537,6 +537,7 @@ struct pptable_funcs {int (*set_fan_speed_rpm)(struct smu_context *smu,uint32_t speed);int (*set_xgmi_pstate)(struct smu_context *smu,uint32_t pstate);int (*gfx_off_control)(struct smu_context *smu,bool enable); +int (*powergate_mmhub)(struct smu_context *smu);int (*register_irq_handler)(struct smu_context *smu);int (*set_azalia_d3_pme)(struct smu_context *smu);int (*get_max_sustainable_clocks_by_dc)(struct smu_context *smu,struct pp_smu_nv_clock_table *max_clocks);
drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h +2 -0
@@ -66,6 +66,8 @@ int smu_v12_0_gfx_off_control(struct smu_context *smu, bool enable);int smu_v12_0_init_smc_tables (struct smu_context *smu); +int smu_v12_0_powergate_mmhub (struct smu_context *smu); +int smu_v12_0_fini_smc_tables (struct smu_context *smu);int smu_v12_0_populate_smc_tables (struct smu_context *smu);
drivers/gpu/drm/amd/powerplay/renoir_ppt.c +1 -0
@@ -702,6 +702,7 @@ static const struct pptable_funcs renoir_ppt_funcs = { .read_smc_arg = smu_v12_0_read_arg, .set_gfx_cgpg = smu_v12_0_set_gfx_cgpg, .gfx_off_control = smu_v12_0_gfx_off_control, + .powergate_mmhub = smu_v12_0_powergate_mmhub, .init_smc_tables = smu_v12_0_init_smc_tables, .fini_smc_tables = smu_v12_0_fini_smc_tables, .populate_smc_tables = smu_v12_0_populate_smc_tables,
drivers/gpu/drm/amd/powerplay/smu_internal.h +2 -0
@@ -65,6 +65,8 @@ ((smu)->ppt_funcs->notify_memory_pool_location ? (smu)->ppt_funcs->notify_memory_pool_location((smu)) : 0)#define smu_gfx_off_control (smu, enable) \ ((smu)->ppt_funcs->gfx_off_control ? (smu)->ppt_funcs->gfx_off_control((smu), (enable)) : 0) +#define smu_powergate_mmhub (smu) \ + ((smu)->ppt_funcs->powergate_mmhub ? (smu)->ppt_funcs->powergate_mmhub((smu)) : 0)#define smu_set_last_dcef_min_deep_sleep_clk (smu) \ ((smu)->ppt_funcs->set_last_dcef_min_deep_sleep_clk ? (smu)->ppt_funcs->set_last_dcef_min_deep_sleep_clk((smu)) : 0)
drivers/gpu/drm/amd/powerplay/smu_v12_0.c +6 -0
@@ -28,6 +28,7 @@#include "atomfirmware.h" #include "amdgpu_atomfirmware.h" #include "smu_v12_0.h" +#include "smu_v12_0_ppsmc.h" #include "soc15_common.h" #include "atom.h"
@@ -261,6 +262,11 @@ int smu_v12_0_gfx_off_control(struct smu_context *smu, bool enable)return ret; } +int smu_v12_0_powergate_mmhub (struct smu_context *smu) +{ +return smu_send_smc_msg (smu, PPSMC_MSG_PowerGateMmHub); +} +int smu_v12_0_init_smc_tables (struct smu_context *smu) {struct smu_table_context *smu_table = &smu->smu_table;
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx