Skip to content

L
linux
Commit a8967967 authored by Alex Deucher's avatar Alex Deucher
Browse files
Options

drm/amdgpu/amdgpu_smu: convert to IP version checking 

Use IP versions rather than asic_type to differentiate
IP version specific features.

v2: rebase
v3: switch some if statements to switch statements
v4: add yellow carp fix (Yifan)
v5: squash in fixes for YC and GS (Alex)
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7c69d615
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 46 deletions
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
View file @ a8967967
...@@ -455,7 +455,8 @@ static int smu_get_power_num_states(void *handle, ...@@ -455,7 +455,8 @@ static int smu_get_power_num_states(void *handle,
bool is_support_sw_smu(struct amdgpu_device *adev) bool is_support_sw_smu(struct amdgpu_device *adev)
{ {
if (adev->asic_type >= CHIP_ARCTURUS) if ((adev->asic_type >= CHIP_ARCTURUS) ||
(adev->ip_versions[MP1_HWIP] >= IP_VERSION(11, 0, 0)))
return true; return true;
return false; return false;
...@@ -575,43 +576,49 @@ static int smu_set_funcs(struct amdgpu_device *adev) ...@@ -575,43 +576,49 @@ static int smu_set_funcs(struct amdgpu_device *adev)
if (adev->pm.pp_feature & PP_OVERDRIVE_MASK) if (adev->pm.pp_feature & PP_OVERDRIVE_MASK)
smu->od_enabled = true; smu->od_enabled = true;
switch (adev->asic_type) { switch (adev->ip_versions[MP1_HWIP]) {
case CHIP_NAVI10: case IP_VERSION(11, 0, 0):
case CHIP_NAVI14: case IP_VERSION(11, 0, 5):
case CHIP_NAVI12: case IP_VERSION(11, 0, 9):
navi10_set_ppt_funcs(smu); navi10_set_ppt_funcs(smu);
break; break;
case CHIP_ARCTURUS: case IP_VERSION(11, 0, 7):
adev->pm.pp_feature &= ~PP_GFXOFF_MASK; case IP_VERSION(11, 0, 11):
arcturus_set_ppt_funcs(smu); case IP_VERSION(11, 0, 12):
/* OD is not supported on Arcturus */ case IP_VERSION(11, 0, 13):
smu->od_enabled =false;
break;
case CHIP_SIENNA_CICHLID:
case CHIP_NAVY_FLOUNDER:
case CHIP_DIMGREY_CAVEFISH:
case CHIP_BEIGE_GOBY:
sienna_cichlid_set_ppt_funcs(smu); sienna_cichlid_set_ppt_funcs(smu);
break; break;
case CHIP_ALDEBARAN: case IP_VERSION(12, 0, 0):
aldebaran_set_ppt_funcs(smu); case IP_VERSION(12, 0, 1):
/* Enable pp_od_clk_voltage node */
smu->od_enabled = true;
break;
case CHIP_RENOIR:
renoir_set_ppt_funcs(smu); renoir_set_ppt_funcs(smu);
break; break;
case CHIP_VANGOGH: case IP_VERSION(11, 5, 0):
vangogh_set_ppt_funcs(smu); vangogh_set_ppt_funcs(smu);
break; break;
case CHIP_YELLOW_CARP: case IP_VERSION(13, 0, 1):
case IP_VERSION(13, 0, 3):
yellow_carp_set_ppt_funcs(smu); yellow_carp_set_ppt_funcs(smu);
break; break;
case CHIP_CYAN_SKILLFISH: case IP_VERSION(11, 0, 8):
cyan_skillfish_set_ppt_funcs(smu); cyan_skillfish_set_ppt_funcs(smu);
break; break;
default: default:
return -EINVAL; switch (adev->asic_type) {
case CHIP_ARCTURUS:
adev->pm.pp_feature &= ~PP_GFXOFF_MASK;
arcturus_set_ppt_funcs(smu);
/* OD is not supported on Arcturus */
smu->od_enabled =false;
break;
case CHIP_ALDEBARAN:
aldebaran_set_ppt_funcs(smu);
/* Enable pp_od_clk_voltage node */
smu->od_enabled = true;
break;
default:
return -EINVAL;
}
break;
} }
return 0; return 0;
...@@ -694,7 +701,8 @@ static int smu_late_init(void *handle) ...@@ -694,7 +701,8 @@ static int smu_late_init(void *handle)
return ret; return ret;
} }
if (adev->asic_type == CHIP_YELLOW_CARP) if ((adev->ip_versions[MP1_HWIP] == IP_VERSION(13, 0, 1)) ||
(adev->ip_versions[MP1_HWIP] == IP_VERSION(13, 0, 3)))
return 0; return 0;
if (!amdgpu_sriov_vf(adev) || smu->od_enabled) { if (!amdgpu_sriov_vf(adev) || smu->od_enabled) {
...@@ -1140,9 +1148,16 @@ static int smu_smc_hw_setup(struct smu_context *smu) ...@@ -1140,9 +1148,16 @@ static int smu_smc_hw_setup(struct smu_context *smu)
if (adev->in_suspend && smu_is_dpm_running(smu)) { if (adev->in_suspend && smu_is_dpm_running(smu)) {
dev_info(adev->dev, "dpm has been enabled\n"); dev_info(adev->dev, "dpm has been enabled\n");
/* this is needed specifically */ /* this is needed specifically */
if ((adev->asic_type >= CHIP_SIENNA_CICHLID) && switch (adev->ip_versions[MP1_HWIP]) {
(adev->asic_type <= CHIP_DIMGREY_CAVEFISH)) case IP_VERSION(11, 0, 7):
case IP_VERSION(11, 0, 11):
case IP_VERSION(11, 5, 0):
case IP_VERSION(11, 0, 12):
ret = smu_system_features_control(smu, true); ret = smu_system_features_control(smu, true);
break;
default:
break;
}
return ret; return ret;
} }
...@@ -1284,7 +1299,7 @@ static int smu_start_smc_engine(struct smu_context *smu) ...@@ -1284,7 +1299,7 @@ static int smu_start_smc_engine(struct smu_context *smu)
int ret = 0; int ret = 0;
if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP) { if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP) {
if (adev->asic_type < CHIP_NAVI10) { if (adev->ip_versions[MP1_HWIP] < IP_VERSION(11, 0, 0)) {
if (smu->ppt_funcs->load_microcode) { if (smu->ppt_funcs->load_microcode) {
ret = smu->ppt_funcs->load_microcode(smu); ret = smu->ppt_funcs->load_microcode(smu);
if (ret) if (ret)
...@@ -1402,23 +1417,41 @@ static int smu_disable_dpms(struct smu_context *smu) ...@@ -1402,23 +1417,41 @@ static int smu_disable_dpms(struct smu_context *smu)
* - SMU firmware can handle the DPM reenablement * - SMU firmware can handle the DPM reenablement
* properly. * properly.
*/ */
if (smu->uploading_custom_pp_table && if (smu->uploading_custom_pp_table) {
(adev->asic_type >= CHIP_NAVI10) && switch (adev->ip_versions[MP1_HWIP]) {
(adev->asic_type <= CHIP_BEIGE_GOBY)) case IP_VERSION(11, 0, 0):
return smu_disable_all_features_with_exception(smu, case IP_VERSION(11, 0, 5):
true, case IP_VERSION(11, 0, 9):
SMU_FEATURE_COUNT); case IP_VERSION(11, 0, 7):
case IP_VERSION(11, 0, 11):
case IP_VERSION(11, 5, 0):
case IP_VERSION(11, 0, 12):
case IP_VERSION(11, 0, 13):
return smu_disable_all_features_with_exception(smu,
true,
SMU_FEATURE_COUNT);
default:
break;
}
}
/* /*
* For Sienna_Cichlid, PMFW will handle the features disablement properly * For Sienna_Cichlid, PMFW will handle the features disablement properly
* on BACO in. Driver involvement is unnecessary. * on BACO in. Driver involvement is unnecessary.
*/ */
if (((adev->asic_type == CHIP_SIENNA_CICHLID) || if (use_baco) {
((adev->asic_type >= CHIP_NAVI10) && (adev->asic_type <= CHIP_NAVI12))) && switch (adev->ip_versions[MP1_HWIP]) {
use_baco) case IP_VERSION(11, 0, 7):
return smu_disable_all_features_with_exception(smu, case IP_VERSION(11, 0, 0):
true, case IP_VERSION(11, 0, 5):
SMU_FEATURE_BACO_BIT); case IP_VERSION(11, 0, 9):
return smu_disable_all_features_with_exception(smu,
true,
SMU_FEATURE_BACO_BIT);
default:
break;
}
}
/* /*
* For gpu reset, runpm and hibernation through BACO, * For gpu reset, runpm and hibernation through BACO,
...@@ -1436,7 +1469,7 @@ static int smu_disable_dpms(struct smu_context *smu) ...@@ -1436,7 +1469,7 @@ static int smu_disable_dpms(struct smu_context *smu)
dev_err(adev->dev, "Failed to disable smu features.\n"); dev_err(adev->dev, "Failed to disable smu features.\n");
} }
if (adev->asic_type >= CHIP_NAVI10 && if (adev->ip_versions[MP1_HWIP] >= IP_VERSION(11, 0, 0) &&
adev->gfx.rlc.funcs->stop) adev->gfx.rlc.funcs->stop)
adev->gfx.rlc.funcs->stop(adev); adev->gfx.rlc.funcs->stop(adev);
...@@ -2229,6 +2262,7 @@ int smu_get_power_limit(void *handle, ...@@ -2229,6 +2262,7 @@ int smu_get_power_limit(void *handle,
enum pp_power_type pp_power_type) enum pp_power_type pp_power_type)
{ {
struct smu_context *smu = handle; struct smu_context *smu = handle;
struct amdgpu_device *adev = smu->adev;
enum smu_ppt_limit_level limit_level; enum smu_ppt_limit_level limit_level;
uint32_t limit_type; uint32_t limit_type;
int ret = 0; int ret = 0;
...@@ -2273,10 +2307,10 @@ int smu_get_power_limit(void *handle, ...@@ -2273,10 +2307,10 @@ int smu_get_power_limit(void *handle,
switch (limit_level) { switch (limit_level) {
case SMU_PPT_LIMIT_CURRENT: case SMU_PPT_LIMIT_CURRENT:
if ((smu->adev->asic_type == CHIP_ALDEBARAN) || if ((smu->adev->asic_type == CHIP_ALDEBARAN) ||
(smu->adev->asic_type == CHIP_SIENNA_CICHLID) || (adev->ip_versions[MP1_HWIP] == IP_VERSION(11, 0, 7)) ||
(smu->adev->asic_type == CHIP_NAVY_FLOUNDER) || (adev->ip_versions[MP1_HWIP] == IP_VERSION(11, 0, 11)) ||
(smu->adev->asic_type == CHIP_DIMGREY_CAVEFISH) || (adev->ip_versions[MP1_HWIP] == IP_VERSION(11, 0, 12)) ||
(smu->adev->asic_type == CHIP_BEIGE_GOBY)) (adev->ip_versions[MP1_HWIP] == IP_VERSION(11, 0, 13)))
ret = smu_get_asic_power_limits(smu, ret = smu_get_asic_power_limits(smu,
&smu->current_power_limit, &smu->current_power_limit,
NULL, NULL,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7