Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61ea6f58 authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amdgpu: Fix vce work queue was not cancelled when suspend 



The vce cancel_delayed_work_sync never be called.
driver call the function in error path.

This caused the A+A suspend hang when runtime pm enebled.
As we will visit the smu in the idle queue. this will cause
smu hang because the dgpu has been suspend, and the dgpu also
will be waked up. As the smu has been hang, so the dgpu resume
will failed.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarFeifei Xu <Feifei.Xu@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 4fcb7f8b

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

+2 −1
Original line number Diff line number Diff line
@@ -258,6 +258,8 @@ int amdgpu_vce_suspend(struct amdgpu_device *adev) 
{

	int i;



	cancel_delayed_work_sync(&adev->vce.idle_work);



	if (adev->vce.vcpu_bo == NULL)

		return 0;
@@ -268,7 +270,6 @@ int amdgpu_vce_suspend(struct amdgpu_device *adev) 
	if (i == AMDGPU_MAX_VCE_HANDLES)

		return 0;



	cancel_delayed_work_sync(&adev->vce.idle_work);

	/* TODO: suspending running encoding sessions isn't supported */

	return -EINVAL;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -153,11 +153,11 @@ int amdgpu_vcn_suspend(struct amdgpu_device *adev) 
	unsigned size;

	void *ptr;



	cancel_delayed_work_sync(&adev->vcn.idle_work);



	if (adev->vcn.vcpu_bo == NULL)

		return 0;



	cancel_delayed_work_sync(&adev->vcn.idle_work);



	size = amdgpu_bo_size(adev->vcn.vcpu_bo);

	ptr = adev->vcn.cpu_addr;