Commit 8f323789 authored by Jack Xiao's avatar Jack Xiao Committed by Alex Deucher
Browse files

drm/amd/amdgpu: fix warning during suspend 

Freeing memory was warned during suspend.
Move the self test out of suspend.

Link: https://bugzilla.redhat.com/show_bug.cgi?id=2151825


Cc: jfalempe@redhat.com
Signed-off-by: default avatarJack Xiao <Jack.Xiao@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarFeifei Xu <Feifei.Xu@amd.com>
Reviewed-and-tested-by: default avatarEvan Quan <evan.quan@amd.com>
Tested-by: default avatarJocelyn Falempe <jfalempe@redhat.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org # 6.1.x
parent ceaa837f

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

+3 −0
Original line number Diff line number Diff line
@@ -4268,6 +4268,9 @@ int amdgpu_device_resume(struct drm_device *dev, bool fbcon) 
	}

	adev->in_suspend = false;



	if (adev->enable_mes)

		amdgpu_mes_self_test(adev);



	if (amdgpu_acpi_smart_shift_update(dev, AMDGPU_SS_DEV_D0))

		DRM_WARN("smart shift update failed\n");

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

+1 −1
Original line number Diff line number Diff line
@@ -1344,7 +1344,7 @@ static int mes_v11_0_late_init(void *handle) 
	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	/* it's only intended for use in mes_self_test case, not for s0ix and reset */

	if (!amdgpu_in_reset(adev) && !adev->in_s0ix &&

	if (!amdgpu_in_reset(adev) && !adev->in_s0ix && !adev->in_suspend &&

	    (adev->ip_versions[GC_HWIP][0] != IP_VERSION(11, 0, 3)))

		amdgpu_mes_self_test(adev);