Commit a3057aa9 authored by Sunil Khatri's avatar Sunil Khatri Committed by Alex Deucher
Browse files

drm/amdgpu/userq: schedule_delayed_work should be after fence signalled 



Reorganise the amdgpu_eviction_fence_suspend_worker code so
schedule_delayed_work is the last thing we do after amdgpu_userq_evict
is complete and the eviction fence is signalled.

Suggested-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarSunil Khatri <sunil.khatri@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 46f4458c

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

+5 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ amdgpu_eviction_fence_suspend_worker(struct work_struct *work) 
	cookie = dma_fence_begin_signalling();



	ev_fence = amdgpu_evf_mgr_get_fence(evf_mgr);

	amdgpu_userq_evict(uq_mgr, !evf_mgr->shutdown);

	amdgpu_userq_evict(uq_mgr);



	/*

	 * Signaling the eviction fence must be done while holding the
@@ -86,6 +86,10 @@ amdgpu_eviction_fence_suspend_worker(struct work_struct *work) 
	dma_fence_signal(ev_fence);

	dma_fence_end_signalling(cookie);

	dma_fence_put(ev_fence);



	if (!evf_mgr->shutdown)

		schedule_delayed_work(&uq_mgr->resume_work, 0);



	mutex_unlock(&uq_mgr->userq_mutex);

}

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

+1 −3
Original line number Diff line number Diff line
@@ -1298,7 +1298,7 @@ amdgpu_userq_wait_for_signal(struct amdgpu_userq_mgr *uq_mgr) 
}



void

amdgpu_userq_evict(struct amdgpu_userq_mgr *uq_mgr, bool schedule_resume)

amdgpu_userq_evict(struct amdgpu_userq_mgr *uq_mgr)

{

	struct amdgpu_device *adev = uq_mgr->adev;

	int ret;
@@ -1312,8 +1312,6 @@ amdgpu_userq_evict(struct amdgpu_userq_mgr *uq_mgr, bool schedule_resume) 
	if (ret)

		dev_err(adev->dev, "Failed to evict userqueue\n");



	if (schedule_resume)

		schedule_delayed_work(&uq_mgr->resume_work, 0);

}



int amdgpu_userq_mgr_init(struct amdgpu_userq_mgr *userq_mgr, struct drm_file *file_priv,

drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h

+1 −2
Original line number Diff line number Diff line
@@ -133,8 +133,7 @@ int amdgpu_userq_create_object(struct amdgpu_userq_mgr *uq_mgr, 
void amdgpu_userq_destroy_object(struct amdgpu_userq_mgr *uq_mgr,

				 struct amdgpu_userq_obj *userq_obj);



void amdgpu_userq_evict(struct amdgpu_userq_mgr *uq_mgr,

			bool schedule_resume);

void amdgpu_userq_evict(struct amdgpu_userq_mgr *uq_mgr);



void amdgpu_userq_ensure_ev_fence(struct amdgpu_userq_mgr *userq_mgr,

				  struct amdgpu_eviction_fence_mgr *evf_mgr);