Commit 6f1ceabb authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: fix VM flush for CPU based updates 



We don't have any update fence in that case, so the need
for flushing isn't detected automatically.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent fd971375

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

+3 −3
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ static int amdgpu_vm_grab_reserved_vmid_locked(struct amdgpu_vm *vm, 
	struct dma_fence *updates = sync->last_vm_update;

	int r = 0;

	struct dma_fence *flushed, *tmp;

	bool needs_flush = false;

	bool needs_flush = vm->use_cpu_for_update;



	flushed  = id->flushed_updates;

	if ((amdgpu_vm_had_gpu_reset(adev, id)) ||
@@ -543,11 +543,11 @@ int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring, 
	}

	kfree(fences);



	job->vm_needs_flush = false;

	job->vm_needs_flush = vm->use_cpu_for_update;

	/* Check if we can use a VMID already assigned to this VM */

	list_for_each_entry_reverse(id, &id_mgr->ids_lru, list) {

		struct dma_fence *flushed;

		bool needs_flush = false;

		bool needs_flush = vm->use_cpu_for_update;



		/* Check all the prerequisites to using this VMID */

		if (amdgpu_vm_had_gpu_reset(adev, id))

CRA Git | Maintained and supported by SUSTech CRA and CCSE