The documentation around PrepareMp1ForUnload message says that anything sent to SMU after this command would be stalled as the PMFW would not be in a state to take further job requests.
Technically this is right in case of S3 scenario. But, this might not be the case during s0ix as the PMC driver would be the last to send the SMU on the OS_HINT. If SMU gets a PrepareMp1ForUnload message before the OS_HINT, this would stall the entire S0ix process.
Results show that, this message to SMU is not required during S0ix and hence skip it.
Signed-off-by: Shyam Sundar S K Shyam-sundar.S-k@amd.com Acked-by: Huang Rui ray.huang@amd.com --- drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c index 7664334d8144..18a1ffdca227 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c @@ -189,10 +189,11 @@ static int yellow_carp_init_smc_tables(struct smu_context *smu) static int yellow_carp_system_features_control(struct smu_context *smu, bool en) { struct smu_feature *feature = &smu->smu_feature; + struct amdgpu_device *adev = smu->adev; uint32_t feature_mask[2]; int ret = 0;
- if (!en) + if (!en && !adev->in_s0ix) ret = smu_cmn_send_smc_msg(smu, SMU_MSG_PrepareMp1ForUnload, NULL);
bitmap_zero(feature->enabled, feature->feature_num);
[AMD Official Use Only]
Thanks update this patch and remove APU flag for avoiding over protection in this case.
Reviewed-by: Prike Liang Prike.Liang@amd.com
-----Original Message----- From: amd-gfx amd-gfx-bounces@lists.freedesktop.org On Behalf Of Shyam Sundar S K Sent: Monday, June 28, 2021 3:55 PM To: Deucher, Alexander Alexander.Deucher@amd.com; Koenig, Christian Christian.Koenig@amd.com; airlied@linux.ie; daniel@ffwll.ch; Huang, Ray Ray.Huang@amd.com; Hou, Xiaomeng (Matthew) Xiaomeng.Hou@amd.com; Liu, Aaron Aaron.Liu@amd.com Cc: S-k, Shyam-sundar Shyam-sundar.S-k@amd.com; dri- devel@lists.freedesktop.org; amd-gfx@lists.freedesktop.org Subject: [PATCH] drm/amd/pm: skip PrepareMp1ForUnload message in s0ix
The documentation around PrepareMp1ForUnload message says that anything sent to SMU after this command would be stalled as the PMFW would not be in a state to take further job requests.
Technically this is right in case of S3 scenario. But, this might not be the case during s0ix as the PMC driver would be the last to send the SMU on the OS_HINT. If SMU gets a PrepareMp1ForUnload message before the OS_HINT, this would stall the entire S0ix process.
Results show that, this message to SMU is not required during S0ix and hence skip it.
Signed-off-by: Shyam Sundar S K Shyam-sundar.S-k@amd.com Acked-by: Huang Rui ray.huang@amd.com
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c index 7664334d8144..18a1ffdca227 100644 --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c @@ -189,10 +189,11 @@ static int yellow_carp_init_smc_tables(struct smu_context *smu) static int yellow_carp_system_features_control(struct smu_context *smu, bool en) { struct smu_feature *feature = &smu->smu_feature;
struct amdgpu_device *adev = smu->adev; uint32_t feature_mask[2]; int ret = 0;
if (!en)
if (!en && !adev->in_s0ix) ret = smu_cmn_send_smc_msg(smu,SMU_MSG_PrepareMp1ForUnload, NULL);
bitmap_zero(feature->enabled, feature->feature_num);-- 2.25.1
amd-gfx mailing list amd-gfx@lists.freedesktop.org https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.f reedesktop.org%2Fmailman%2Flistinfo%2Famd- gfx&data=04%7C01%7CPrike.Liang%40amd.com%7C05062eb7dd9c4520 b28d08d93a0a0c5e%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7 C637604637106550264%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAw MDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sd ata=fyo4FgXkxaRWWPEAMufdXj0f2aom%2Fhz8nE%2FZP1AM7Wo%3D& reserved=0
dri-devel@lists.freedesktop.org
-
Liang, Prike -
Shyam Sundar S K