[PATCH] drm/amd/powerplay: Disable gfx CGPG when suspend smu

Gong, Curry Curry.Gong at amd.com
Mon Oct 28 02:34:54 UTC 2019


Hi Ray:

Because I found that enable CGPG for all APU in smu_resume at 0d2e9b10428a6

commit 0d2e9b10428a6c261c99f2d982be7745f35eef97
Author: Prike Liang <Prike.Liang at amd.com>
Date:   Tue Oct 15 17:11:49 2019 +0800

    drm/amdgpu: fix S3 failed as RLC safe mode entry stucked in polloing gfx acq

    Fix gfx cgpg setting sequence for RLC deadlock at safe mode entry in polling gfx response.
    The patch can fix VCN IB test failed and DAL get dispaly count failed issue.

    Signed-off-by: Prike Liang <Prike.Liang at amd.com>
    Reviewed-by: Huang Rui <ray.huang at amd.com>


diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
index acec69b74734..e2a03f411d6b 100644
--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
@@ -1350,6 +1351,9 @@ static int smu_resume(void *handle)
        if (ret)
                goto failed;

+       if (smu->is_apu)
+               smu_set_gfx_cgpg(&adev->smu, true);
+
        mutex_unlock(&smu->mutex);

        pr_info("SMU is resumed successfully!\n");

-----Original Message-----
From: Huang, Ray <Ray.Huang at amd.com> 
Sent: Friday, October 25, 2019 9:26 PM
To: Gong, Curry <Curry.Gong at amd.com>; amd-gfx at lists.freedesktop.org
Cc: Gong, Curry <Curry.Gong at amd.com>
Subject: RE: [PATCH] drm/amd/powerplay: Disable gfx CGPG when suspend smu

Why do you disable CGPG for all APU?

Thanks,
Ray

-----Original Message-----
From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> On Behalf Of chen gong
Sent: Friday, October 25, 2019 7:07 PM
To: amd-gfx at lists.freedesktop.org
Cc: Gong, Curry <Curry.Gong at amd.com>
Subject: [PATCH] drm/amd/powerplay: Disable gfx CGPG when suspend smu

if no disable gfx CGPG when suspend smu, enabling gfx CGPG will fail when resume smu.

Platform: Renoir
dmesg log information:

[  151.844110 ] amdgpu: [powerplay] SMU is resuming...
[  151.844116 ] amdgpu: [powerplay] dpm has been disabled [  151.844604 ] amdgpu: [powerplay] Failed to send message 0x2f,response 0xfffffffb param 0x1 [  151.844605 ] amdgpu: [powerplay] SMU is resumed successfully!

Signed-off-by: chen gong <curry.gong at amd.com>
---
 drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
index 26923aa..4e468b0 100644
--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
@@ -1351,6 +1351,8 @@ static int smu_suspend(void *handle)
 	if (adev->asic_type >= CHIP_NAVI10 &&
 	    adev->gfx.rlc.funcs->stop)
 		adev->gfx.rlc.funcs->stop(adev);
+	if (smu->is_apu)
+		smu_set_gfx_cgpg(&adev->smu, false);
 
 	return 0;
 }
--
2.7.4

_______________________________________________
amd-gfx mailing list
amd-gfx at lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx


More information about the amd-gfx mailing list