答复: [PATCH] drm/amd/pm: skip to set mp1 unload state in special case

[Feng, Kenneth]

[AMD Official Use Only - General]


[AMD Official Use Only - General]
Reviewed-by: Kenneth Feng <kenneth.feng at amd.com<mailto:kenneth.feng at amd.com>>


Best wishes
Kenneth Feng


发件人: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> 代表 Yang Wang <KevinYang.Wang at amd.com>
日期: 星期五, 2022年6月10日 11:52
收件人: amd-gfx at lists.freedesktop.org <amd-gfx at lists.freedesktop.org>
抄送: Feng, Kenneth <Kenneth.Feng at amd.com>, Wang, Yang(Kevin) <KevinYang.Wang at amd.com>
主题: [PATCH] drm/amd/pm: skip to set mp1 unload state in special case
[CAUTION: External Email]

set mp1 unload state will cause the SMC FW can't accept any SMU message,
skip to set mp1 unload state to avoid following case fail:
- runtime pm case.
- gpu reset case.

Fixes: 826126d8f805 ("drm/amd/pm: fix driver reload SMC firmware fail issue for smu13")

Signed-off-by: Yang Wang <KevinYang.Wang at amd.com>
---
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index 3d269d1c2749..fd79b213fab4 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -1415,12 +1415,13 @@ static int smu_disable_dpms(struct smu_context *smu)
        switch (adev->ip_versions[MP1_HWIP][0]) {
        case IP_VERSION(13, 0, 0):
        case IP_VERSION(13, 0, 7):
-               ret = smu_set_mp1_state(smu, PP_MP1_STATE_UNLOAD);
-               if (ret) {
-                       dev_err(adev->dev, "Fail set mp1 state to UNLOAD!\n");
-                       return ret;
+               if (!(adev->in_runpm || amdgpu_in_reset(adev))) {
+                       ret = smu_set_mp1_state(smu, PP_MP1_STATE_UNLOAD);
+                       if (ret) {
+                               dev_err(adev->dev, "Fail set mp1 state to UNLOAD!\n");
+                               return ret;
+                       }
                }
-
                return 0;
        default:
                break;
--
2.25.1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20220610/ce7c55a8/attachment-0001.htm>