Commit 3a9626c8 authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher
Browse files

drm/amd: Stop evicting resources on APUs in suspend 



commit 5095d541 ("drm/amd: Evict resources during PM ops prepare()
callback") intentionally moved the eviction of resources to earlier in
the suspend process, but this introduced a subtle change that it occurs
before adev->in_s0ix or adev->in_s3 are set. This meant that APUs
actually started to evict resources at suspend time as well.

Explicitly set s0ix or s3 in the prepare() stage, and unset them if the
prepare() stage failed.

v2: squash in warning fix from Stephen Rothwell

Reported-by: default avatarJürg Billeter <j@bitron.ch>
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3132#note_2271038


Fixes: 5095d541 ("drm/amd: Evict resources during PM ops prepare() callback")
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ccc514b7

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

+2 −0
Original line number Diff line number Diff line
@@ -1550,9 +1550,11 @@ static inline int amdgpu_acpi_smart_shift_update(struct drm_device *dev, 
#if defined(CONFIG_ACPI) && defined(CONFIG_SUSPEND)

bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev);

bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev);

void amdgpu_choose_low_power_state(struct amdgpu_device *adev);

#else

static inline bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev) { return false; }

static inline bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) { return false; }

static inline void amdgpu_choose_low_power_state(struct amdgpu_device *adev) { }

#endif



#if defined(CONFIG_DRM_AMD_DC)

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

+15 −0
Original line number Diff line number Diff line
@@ -1519,4 +1519,19 @@ bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev) 
#endif /* CONFIG_AMD_PMC */

}



/**

 * amdgpu_choose_low_power_state

 *

 * @adev: amdgpu_device_pointer

 *

 * Choose the target low power state for the GPU

 */

void amdgpu_choose_low_power_state(struct amdgpu_device *adev)

{

	if (amdgpu_acpi_is_s0ix_active(adev))

		adev->in_s0ix = true;

	else if (amdgpu_acpi_is_s3_active(adev))

		adev->in_s3 = true;

}



#endif /* CONFIG_SUSPEND */

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

+9 −2
Original line number Diff line number Diff line
@@ -4514,13 +4514,15 @@ int amdgpu_device_prepare(struct drm_device *dev) 
	struct amdgpu_device *adev = drm_to_adev(dev);

	int i, r;



	amdgpu_choose_low_power_state(adev);



	if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)

		return 0;



	/* Evict the majority of BOs before starting suspend sequence */

	r = amdgpu_device_evict_resources(adev);

	if (r)

		return r;

		goto unprepare;



	for (i = 0; i < adev->num_ip_blocks; i++) {

		if (!adev->ip_blocks[i].status.valid)
@@ -4529,10 +4531,15 @@ int amdgpu_device_prepare(struct drm_device *dev) 
			continue;

		r = adev->ip_blocks[i].version->funcs->prepare_suspend((void *)adev);

		if (r)

			return r;

			goto unprepare;

	}



	return 0;



unprepare:

	adev->in_s0ix = adev->in_s3 = false;



	return r;

}



/**