From 1a6807647b03580f459a0b09ba470d05d18bc522 Mon Sep 17 00:00:00 2001 From: "Le.Ma" Date: Thu, 7 Dec 2017 16:36:11 +0800 Subject: [PATCH 2804/4131] drm/amdkfd: Fix to mark fence as explicit for kfd Change-Id: Iede0b52ac16e11003b65b69c321ca7241c108e65 Signed-off-by: Le.Ma Reviewed-by: Xiaojie Yuan --- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c index 0efe245..c6e3d60 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c @@ -932,7 +932,7 @@ static int unmap_bo_from_gpuvm(struct amdgpu_device *adev, /* Add the eviction fence back */ amdgpu_bo_fence(pd, &kvm->process_info->eviction_fence->base, true); - amdgpu_sync_fence(adev, sync, bo_va->last_pt_update); + amdgpu_sync_fence(adev, sync, bo_va->last_pt_update, false); /* Sync objects can't handle multiple GPUs (contexts) updating * sync->last_vm_update. Fortunately we don't need it for @@ -966,7 +966,7 @@ static int update_gpuvm_pte(struct amdgpu_device *adev, return ret; } - amdgpu_sync_fence(adev, sync, bo_va->last_pt_update); + amdgpu_sync_fence(adev, sync, bo_va->last_pt_update, false); /* Sync objects can't handle multiple GPUs (contexts) updating * sync->last_vm_update. Fortunately we don't need it for diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c index 5049698..2a30c3f 100755 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c @@ -330,7 +330,7 @@ int amdgpu_sync_clone(struct amdgpu_device *adev, f = e->fence; if (!dma_fence_is_signaled(f)) { - r = amdgpu_sync_fence(adev, clone, f); + r = amdgpu_sync_fence(adev, clone, f, false); if (r) return r; } else { -- 2.7.4