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

Commit 85cc88f0 authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amdgpu: when suspending, if uvd/vce was running. need to cancel delay work. 



fix the issue that when resume back, uvd/vce
dpm was disabled and uvd/vce's performace
dropped.

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

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

+2 −0
Original line number Diff line number Diff line
@@ -255,6 +255,8 @@ 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;

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

+1 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ 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;

}