Commit 9f875167 authored by Jesse Zhang's avatar Jesse Zhang Committed by Alex Deucher
Browse files

drm/amd/amdgpu: finish delay works before release resources 



flush/cancel delayed works before doing finalization
to avoid concurrently requests.

Signed-off-by: default avatarJesse Zhang <zhexi.zhang@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4cae34d0

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

+3 −0
Original line number Diff line number Diff line
@@ -3110,6 +3110,9 @@ void amdgpu_device_fini(struct amdgpu_device *adev) 


	DRM_INFO("amdgpu: finishing device.\n");

	adev->shutdown = true;



	flush_delayed_work(&adev->delayed_init_work);



	/* disable all interrupts */

	amdgpu_irq_disable_all(adev);

	if (adev->mode_info.mode_config_initialized){

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

+1 −0
Original line number Diff line number Diff line
@@ -299,6 +299,7 @@ int amdgpu_uvd_sw_fini(struct amdgpu_device *adev) 
{

	int i, j;



	cancel_delayed_work_sync(&adev->uvd.idle_work);

	drm_sched_entity_destroy(&adev->uvd.entity);



	for (j = 0; j < adev->uvd.num_uvd_inst; ++j) {

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

+1 −0
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ int amdgpu_vce_sw_fini(struct amdgpu_device *adev) 
	if (adev->vce.vcpu_bo == NULL)

		return 0;



	cancel_delayed_work_sync(&adev->vce.idle_work);

	drm_sched_entity_destroy(&adev->vce.entity);



	amdgpu_bo_free_kernel(&adev->vce.vcpu_bo, &adev->vce.gpu_addr,