RE: [PATCH] drm/amdgpu/sriov Don't send msg when smu suspend

[Zhang, Jack (Jian)]

Hi, Team,

Would you please help to take a look at this patch?

Regards,
Jack

-----Original Message-----
From: amd-gfx <amd-gfx-boun...@lists.freedesktop.org> On Behalf Of Jack Zhang
Sent: Wednesday, February 5, 2020 5:18 PM
To: amd-gfx@lists.freedesktop.org
Cc: Zhang, Jack (Jian) <jack.zha...@amd.com>
Subject: [PATCH] drm/amdgpu/sriov Don't send msg when smu suspend

For sriov and pp_onevf_mode, do not send message to set smu status, becasue smu 
doesn't support these messages under VF.

Besides, it should skip smu_suspend when pp_onevf_mode is disabled.

Signed-off-by: Jack Zhang <jack.zha...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 15 ++++++++-------  
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 21 +++++++++++++--------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 4ff7ce3..2d1f8d4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2353,15 +2353,16 @@ static int amdgpu_device_ip_suspend_phase2(struct 
amdgpu_device *adev)
                }
                adev->ip_blocks[i].status.hw = false;
                /* handle putting the SMC in the appropriate state */
-               if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_SMC) {
-                       r = amdgpu_dpm_set_mp1_state(adev, adev->mp1_state);
-                       if (r) {
-                               DRM_ERROR("SMC failed to set mp1 state %d, 
%d\n",
-                                         adev->mp1_state, r);
-                               return r;
+               if(!amdgpu_sriov_vf(adev)){
+                       if (adev->ip_blocks[i].version->type == 
AMD_IP_BLOCK_TYPE_SMC) {
+                               r = amdgpu_dpm_set_mp1_state(adev, 
adev->mp1_state);
+                               if (r) {
+                                       DRM_ERROR("SMC failed to set mp1 state 
%d, %d\n",
+                                                       adev->mp1_state, r);
+                                       return r;
+                               }
                        }
                }
-
                adev->ip_blocks[i].status.hw = false;
        }
 
diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c 
b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
index 99ad4dd..a6d7b5f 100644
--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
@@ -1461,21 +1461,26 @@ static int smu_suspend(void *handle)
        struct smu_context *smu = &adev->smu;
        bool baco_feature_is_enabled = false;
 
+       if (amdgpu_sriov_vf(adev)&& !amdgpu_sriov_is_pp_one_vf(adev))
+               return 0;
+
        if (!smu->pm_enabled)
                return 0;
 
        if(!smu->is_apu)
                baco_feature_is_enabled = smu_feature_is_enabled(smu, 
SMU_FEATURE_BACO_BIT);
 
-       ret = smu_system_features_control(smu, false);
-       if (ret)
-               return ret;
-
-       if (baco_feature_is_enabled) {
-               ret = smu_feature_set_enabled(smu, SMU_FEATURE_BACO_BIT, true);
-               if (ret) {
-                       pr_warn("set BACO feature enabled failed, return %d\n", 
ret);
+       if(!amdgpu_sriov_vf(adev)) {
+               ret = smu_system_features_control(smu, false);
+               if (ret)
                        return ret;
+
+               if (baco_feature_is_enabled) {
+                       ret = smu_feature_set_enabled(smu, 
SMU_FEATURE_BACO_BIT, true);
+                       if (ret) {
+                               pr_warn("set BACO feature enabled failed, 
return %d\n", ret);
+                               return ret;
+                       }
                }
        }
 
--
2.7.4

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=02%7C01%7CJack.Zhang1%40amd.com%7Ceb00cb04455340909ef908d7aa1c5ab5%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637164911088955698&amp;sdata=AtqrYF%2Br53lO9oQLu6Q%2BPeco5KKDGKODjCvOWQmO9hw%3D&amp;reserved=0
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx