Skip to contentSkip to conversation

drm/amdgpu: enable hibernate support on Navi1X

PATCH In review Evan Quan 2 participants 2 messages May 7, 2020

Subsystems (2)
lore
Share & tools
lore

Evan Quan

author
#0 lore raw

PATCH 1/1 drm/amdgpu: enable hibernate support on Navi1X

BACO is needed to support hibernate on Navi1X.

Change-Id Ia283612919e9a5b4e1e198ab2cc0bc15f7f94760
---
 drivers/gpu/drm/amd/amdgpu/amdgpu.h        | 1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c    | 2 ++
 drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
index 5bd213f88ae5..e649a3d3fd7c 100644
@@ -1010,6 +1010,7 @@ struct amdgpu_device {
 
 	/* s3/s4 mask */
 	bool                            in_suspend;
+	bool				in_hibernate;
 
 	bool                            in_gpu_reset;
 	enum pp_mp1_state               mp1_state;
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +2 -0
index eb351844e46c..5eaa5ea83d0c 100644
@@ -1260,7 +1260,9 @@ static int amdgpu_pmops_freeze(struct device *dev)
 	struct amdgpu_device *adev = drm_dev->dev_private;
 	int r;
 
+	adev->in_hibernate = true;
 	r = amdgpu_device_suspend(drm_dev, true);
+	adev->in_hibernate = false;
 	if (r)
 		return r;
 	return amdgpu_asic_reset(adev);
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +1 -1
index 8a0c37dc5182..f1621147db61 100644
@@ -1500,7 +1500,7 @@ static int smu_disable_dpm(struct smu_context *smu)
 	bool use_baco = !smu->is_apu &&
 		((adev->in_gpu_reset &&
 		  (amdgpu_asic_reset_method(adev) == AMD_RESET_METHOD_BACO)) ||
-		 (adev->in_runpm && amdgpu_asic_supports_baco(adev)));
+		 ((adev->in_runpm || adev->in_hibernate) && amdgpu_asic_supports_baco(adev)));
 
 	ret = smu_get_smc_version(smu, NULL, &smu_version);
 	if (ret) {
Signature · 6 lines
2.26.2

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Acked-by on v1 1/1
#1 lore raw
Quoted 5 lines · Evan Quan

BACO is needed to support hibernate on Navi1X.

Change-Id Ia283612919e9a5b4e1e198ab2cc0bc15f7f94760
Quoted 48 lines
---
 drivers/gpu/drm/amd/amdgpu/amdgpu.h        | 1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c    | 2 ++
 drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
index 5bd213f88ae5..e649a3d3fd7c 100644
@@ -1010,6 +1010,7 @@ struct amdgpu_device {
 
        /* s3/s4 mask */
        bool                            in_suspend;
+       bool                            in_hibernate;
 
        bool                            in_gpu_reset;
        enum pp_mp1_state               mp1_state;
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +2 -0
index eb351844e46c..5eaa5ea83d0c 100644
@@ -1260,7 +1260,9 @@ static int amdgpu_pmops_freeze(struct device *dev)
        struct amdgpu_device *adev = drm_dev->dev_private;
        int r;
 
+       adev->in_hibernate = true;
        r = amdgpu_device_suspend(drm_dev, true);
+       adev->in_hibernate = false;
        if (r)
                return r;
        return amdgpu_asic_reset(adev);
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +1 -2
index 8a0c37dc5182..f1621147db61 100644
@@ -1500,7 +1500,7 @@ static int smu_disable_dpm(struct smu_context *smu)
        bool use_baco = !smu->is_apu &&
                ((adev->in_gpu_reset &&
                  (amdgpu_asic_reset_method(adev) == AMD_RESET_METHOD_BACO)) ||
-                (adev->in_runpm && amdgpu_asic_supports_baco(adev)));
+                ((adev->in_runpm || adev->in_hibernate) && amdgpu_asic_supports_baco(adev)));
 
        ret = smu_get_smc_version(smu, NULL, &smu_version);
        if (ret) {
--

2.26.2

Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx