Commit 8639d2f5 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: fix call to amdgpu_eviction_fence_detach 



That needs to be done after grabbing the lock, not before.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarArvind Yadav <arvind.yadav@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent adba0929

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

+3 −3
Original line number Diff line number Diff line
@@ -351,9 +351,6 @@ static void amdgpu_gem_object_close(struct drm_gem_object *obj, 
	struct drm_exec exec;

	long r;



	if (!amdgpu_vm_is_bo_always_valid(vm, bo))

		amdgpu_eviction_fence_detach(&fpriv->evf_mgr, bo);



	drm_exec_init(&exec, DRM_EXEC_IGNORE_DUPLICATES, 0);

	drm_exec_until_all_locked(&exec) {

		r = drm_exec_prepare_obj(&exec, &bo->tbo.base, 1);
@@ -367,6 +364,9 @@ static void amdgpu_gem_object_close(struct drm_gem_object *obj, 
			goto out_unlock;

	}



	if (!amdgpu_vm_is_bo_always_valid(vm, bo))

		amdgpu_eviction_fence_detach(&fpriv->evf_mgr, bo);



	bo_va = amdgpu_vm_bo_find(vm, bo);

	if (!bo_va || --bo_va->ref_count)

		goto out_unlock;