drm/amd/pm: support mode1 reset on smu_v14_0_3
Subsystems (3)
Alex Deucher
maintainerPATCH 1/4 drm/amd/pm: support mode1 reset on smu_v14_0_3
From: Kenneth Feng <[email protected]>
support mode1 reset on smu_v14_0_3
Signed-off-by Kenneth Feng <[email protected]>
Reviewed-by Likun Gao <[email protected]>
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/soc24.c | 1 + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 2 ++ 2 files changed, 3 insertions(+)
drivers/gpu/drm/amd/amdgpu/soc24.c +1 -0
@@ -204,6 +204,7 @@ soc24_asic_reset_method(struct amdgpu_device *adev)switch (amdgpu_ip_version (adev,MP1_HWIP ,0 )) {case IP_VERSION (14 ,0 ,2 ): +case IP_VERSION (14 ,0 ,3 ):return AMD_RESET_METHOD_MODE1 ;default :if (amdgpu_dpm_is_baco_supported (adev))
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +2 -0
@@ -1844,6 +1844,8 @@ static int smu_disable_dpms(struct smu_context *smu)case IP_VERSION (13 ,0 ,0 ):case IP_VERSION (13 ,0 ,7 ):case IP_VERSION (13 ,0 ,10 ): +case IP_VERSION (14 ,0 ,2 ): +case IP_VERSION (14 ,0 ,3 ):return 0 ;default :break ;
Signature · 1 line
2.44.0
Alex Deucher
maintainerPATCH 2/4 drm/amd/pm: enable mode1 reset on smu v14.0.2/v14.0.3
From: Kenneth Feng <[email protected]>
enable mode1 reset on smu v14.0.2/v14.0.3
Signed-off-by Kenneth Feng <[email protected]>
Reviewed-by Likun Gao <[email protected]>
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c +7 -1
@@ -1637,7 +1637,13 @@ static int smu_v14_0_2_mode1_reset(struct smu_context *smu) {int ret =0 ; -// TODO + ret =smu_cmn_send_smc_msg (smu, SMU_MSG_Mode1Reset,NULL ); +if (!ret) { +if (amdgpu_emu_mode ==1 ) +msleep (50000 ); +else +msleep (500 ); + }return ret; }
Signature · 1 line
2.44.0
Alex Deucher
maintainerPATCH 3/4 drm/amd/pm: add tool log support on smu v14.0.2/3
In reply to Alex DeucherFrom: Kenneth Feng <[email protected]>
add tool log support on smu v14.0.2/3
Signed-off-by Kenneth Feng <[email protected]>
Reviewed-by Jack Gui <[email protected]>
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h | 2 ++ drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 2 ++ 2 files changed, 4 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h +2 -0
@@ -46,6 +46,8 @@#define MAX_DPM_LEVELS 16#define MAX_PCIE_CONF 3 +#define SMU14_TOOL_SIZE 0x19000 +struct smu_14_0_max_sustainable_clocks {uint32_t display_clock;uint32_t phy_clock;
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c +2 -0
@@ -465,6 +465,8 @@ static int smu_v14_0_2_tables_init(struct smu_context *smu) PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);SMU_TABLE_INIT (tables,SMU_TABLE_OVERDRIVE ,sizeof (OverDriveTable_t),PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM ); +SMU_TABLE_INIT (tables,SMU_TABLE_PMSTATUSLOG ,SMU14_TOOL_SIZE , +PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM );SMU_TABLE_INIT (tables,SMU_TABLE_ACTIVITY_MONITOR_COEFF ,sizeof (DpmActivityMonitorCoeffIntExternal_t),PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM );
Signature · 1 line
2.44.0
Alex Deucher
maintainerPATCH 4/4 drm/amd/pm: add pstate support for SMU_14_0_2
In reply to Alex DeucherFrom: Gui Chengming <[email protected]>
Populate pstate clock.
Signed-off-by Gui Chengming <[email protected]>
Reviewed-by Kenneth Feng <[email protected]>
Change-Id Ib95b7a334c1bd51592535b40fd2e7b8f6802571f
Signed-off-by Alex Deucher <[email protected]>
--- .../drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 54 ++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c +53 -1
@@ -1232,7 +1232,59 @@ static int smu_v14_0_2_get_thermal_temperature_range(struct smu_context *smu,static int smu_v14_0_2_populate_umd_state_clk (struct smu_context *smu) { -// TODO +struct smu_14_0_dpm_context *dpm_context = + smu->smu_dpm.dpm_context; +struct smu_14_0_dpm_table *gfx_table = + &dpm_context->dpm_tables.gfx_table; +struct smu_14_0_dpm_table *mem_table = + &dpm_context->dpm_tables.uclk_table; +struct smu_14_0_dpm_table *soc_table = + &dpm_context->dpm_tables.soc_table; +struct smu_14_0_dpm_table *vclk_table = + &dpm_context->dpm_tables.vclk_table; +struct smu_14_0_dpm_table *dclk_table = + &dpm_context->dpm_tables.dclk_table; +struct smu_14_0_dpm_table *fclk_table = + &dpm_context->dpm_tables.fclk_table; +struct smu_umd_pstate_table *pstate_table = + &smu->pstate_table; +struct smu_table_context *table_context = &smu->smu_table; +PPTable_t *pptable = table_context->driver_pptable; +DriverReportedClocks_t driver_clocks = + pptable->SkuTable.DriverReportedClocks; + + pstate_table->gfxclk_pstate.min = gfx_table->min; +if (driver_clocks.GameClockAc && + (driver_clocks.GameClockAc < gfx_table->max)) + pstate_table->gfxclk_pstate.peak = driver_clocks.GameClockAc; +else + pstate_table->gfxclk_pstate.peak = gfx_table->max; + + pstate_table->uclk_pstate.min = mem_table->min; + pstate_table->uclk_pstate.peak = mem_table->max; + + pstate_table->socclk_pstate.min = soc_table->min; + pstate_table->socclk_pstate.peak = soc_table->max; + + pstate_table->vclk_pstate.min = vclk_table->min; + pstate_table->vclk_pstate.peak = vclk_table->max; + + pstate_table->dclk_pstate.min = dclk_table->min; + pstate_table->dclk_pstate.peak = dclk_table->max; + + pstate_table->fclk_pstate.min = fclk_table->min; + pstate_table->fclk_pstate.peak = fclk_table->max; + +if (driver_clocks.BaseClockAc && + driver_clocks.BaseClockAc < gfx_table->max) + pstate_table->gfxclk_pstate.standard = driver_clocks.BaseClockAc; +else + pstate_table->gfxclk_pstate.standard = gfx_table->max; + pstate_table->uclk_pstate.standard = mem_table->max; + pstate_table->socclk_pstate.standard = soc_table->min; + pstate_table->vclk_pstate.standard = vclk_table->min; + pstate_table->dclk_pstate.standard = dclk_table->min; + pstate_table->fclk_pstate.standard = fclk_table->min;return 0 ; }
Signature · 1 line
2.44.0