Commit b2b6290a authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amdgpu: enable hibernate support on Navi1X 



BACO is needed to support hibernate on Navi1X.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 39b3128d

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −0
Original line number Diff line number Diff line
@@ -945,6 +945,7 @@ struct amdgpu_device { 


	/* s3/s4 mask */

	bool                            in_suspend;

	bool				in_hibernate;



	/* record last mm index being written through WREG32*/

	unsigned long last_mm_index;

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+2 −0
Original line number Diff line number Diff line
@@ -1181,7 +1181,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
Original line number Diff line number Diff line
@@ -1476,7 +1476,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) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE