drm/amd/powerplay: correct the bootup power source for Navi1X
Subsystems (2)
PATCH 1/1 drm/amd/powerplay: correct the bootup power source for Navi1X
PMFW may boots those ASICs with DC mode. Need to set it back to AC mode.
Change-Id I56ffd0e747f778aa013da43a8693ddfb5da31e3c
Signed-off-by Evan Quan <[email protected]>
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 15 +++++++++++++++ drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 1 + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 16 ++++++++++++++++ drivers/gpu/drm/amd/powerplay/smu_internal.h | 3 +++ 4 files changed, 35 insertions(+)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +15 -0
@@ -1144,6 +1144,21 @@ static int smu_smc_table_hw_init(struct smu_context *smu, } } } + +if (adev->asic_type >=CHIP_NAVI10 && + adev->asic_type <=CHIP_NAVI12 ) { +/* +* For Navi1X, manually switch it to AC mode as PMFW +* may boot it with DC mode. +* TODO: should check whether we are indeed under AC +* mode before doing this. +*/ + ret =smu_set_power_source (smu,SMU_POWER_SOURCE_AC ); +if (ret) { +pr_err ("Failed to switch to AC mode!\n" ); +return ret; + } + } }if (adev->asic_type !=CHIP_ARCTURUS ) { ret =smu_notify_display_change (smu);
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +1 -0
@@ -570,6 +570,7 @@ struct pptable_funcs {int (*override_pcie_parameters)(struct smu_context *smu);uint32_t (*get_pptable_power_limit)(struct smu_context *smu);int (*disable_umc_cdr_12gbps_workaround)(struct smu_context *smu); +int (*set_power_source)(struct smu_context *smu,enum smu_power_src_type power_src); };int smu_load_microcode (struct smu_context *smu);
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +16 -0
@@ -2275,6 +2275,21 @@ static int navi10_disable_umc_cdr_12gbps_workaround(struct smu_context *smu)return navi10_dummy_pstate_control (smu, true); } +static int navi10_set_power_source (struct smu_context *smu, +enum smu_power_src_type power_src) +{ +int pwr_source; + + pwr_source =navi10_get_pwr_src_index (smu, (uint32_t )power_src); +if (pwr_source <0 ) +return -EINVAL ; + +return smu_send_smc_msg_with_param (smu, + SMU_MSG_NotifyPowerSource, + pwr_source, +NULL ); +} +static const struct pptable_funcs navi10_ppt_funcs = { .tables_init = navi10_tables_init, .alloc_dpm_context = navi10_allocate_dpm_context,
@@ -2369,6 +2384,7 @@ static const struct pptable_funcs navi10_ppt_funcs = { .get_pptable_power_limit = navi10_get_pptable_power_limit, .run_btc = navi10_run_btc, .disable_umc_cdr_12gbps_workaround = navi10_disable_umc_cdr_12gbps_workaround, + .set_power_source = navi10_set_power_source, };void navi10_set_ppt_funcs (struct smu_context *smu)
drivers/gpu/drm/amd/powerplay/smu_internal.h +3 -0
@@ -211,4 +211,7 @@ static inline int smu_send_smc_msg(struct smu_context *smu, enum smu_message_typ#define smu_disable_umc_cdr_12gbps_workaround (smu) \ ((smu)->ppt_funcs->disable_umc_cdr_12gbps_workaround ? (smu)->ppt_funcs->disable_umc_cdr_12gbps_workaround((smu)) : 0) +#define smu_set_power_source (smu, power_src) \ + ((smu)->ppt_funcs->set_power_source ? (smu)->ppt_funcs->set_power_source((smu), (power_src)) : 0) +#endif
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx