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

Commit 8daf94e9 authored by Jim Qu's avatar Jim Qu Committed by Alex Deucher
Browse files

drm/amdgpu: always cancel uvd idle handler in uvd suspend 



Signed-off-by: default avatarJim Qu <Jim.Qu@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 041d9d93

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

+2 −2
Original line number Diff line number Diff line
@@ -297,6 +297,8 @@ int amdgpu_uvd_suspend(struct amdgpu_device *adev) 
	if (adev->uvd.vcpu_bo == NULL)

		return 0;



	cancel_delayed_work_sync(&adev->uvd.idle_work);



	for (i = 0; i < adev->uvd.max_handles; ++i)

		if (atomic_read(&adev->uvd.handles[i]))

			break;
@@ -304,8 +306,6 @@ int amdgpu_uvd_suspend(struct amdgpu_device *adev) 
	if (i == AMDGPU_MAX_UVD_HANDLES)

		return 0;



	cancel_delayed_work_sync(&adev->uvd.idle_work);



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

	ptr = adev->uvd.cpu_addr;