drm/amdgpu: add VM update fences back to the root PD v2 (42e5fee6) · Commits · 戴 / test

Add update fences to the root PD while mapping BOs. Otherwise PDs freed during the mapping won't wait for updates to finish and can cause corruptions. v2: rebased on drm-misc-next Signed-off-by:

Christian König <christian.koenig@amd.com> Fixes: drm/amdgpu: stop adding VM updates fences to the resv obj Reviewed-by:

xinhui pan <xinhui.pan@amd.com> Tested-by:

Luben Tuikov <luben.tuikov@amd.com> Signed-off-by:

Alex Deucher <alexander.deucher@amd.com>

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

+12 −2

Original line number	Diff line number	Diff line
		@@ -585,8 +585,8 @@ void amdgpu_vm_get_pd_bo(struct amdgpu_vm *vm,
		{
		entry->priority = 0;
		entry->tv.bo = &vm->root.base.bo->tbo;
		/* One for TTM and one for the CS job */
		entry->tv.num_shared = 2;
		/* Two for VM updates, one for TTM and one for the CS job */
		entry->tv.num_shared = 4;
		entry->user_pages = NULL;
		list_add(&entry->tv.head, validated);
		}
		@@ -1599,6 +1599,16 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev,
		goto error_unlock;
		}

		if (flags & AMDGPU_PTE_VALID) {
		struct amdgpu_bo *root = vm->root.base.bo;

		if (!dma_fence_is_signaled(vm->last_direct))
		amdgpu_bo_fence(root, vm->last_direct, true);

		if (!dma_fence_is_signaled(vm->last_delayed))
		amdgpu_bo_fence(root, vm->last_delayed, true);
		}

		r = vm->update_funcs->prepare(&params, resv, sync_mode);
		if (r)
		goto error_unlock;

Admin message