1 files changed, 13 insertions, 3 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 99424cb8020b..89dcb07ab213 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -759,10 +759,11 @@ static void amdgpu_cs_parser_fini(struct amdgpu_cs_parser *parser, int error, bo
         amdgpu_bo_unref(&parser->uf_entry.robj);
 }
 
-static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p,
-                                   struct amdgpu_vm *vm)
+static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p)
 {
         struct amdgpu_device *adev = p->adev;
+        struct amdgpu_fpriv *fpriv = p->filp->driver_priv;
+        struct amdgpu_vm *vm = &fpriv->vm;
         struct amdgpu_bo_va *bo_va;
         struct amdgpu_bo *bo;
         int i, r;
@@ -779,6 +780,15 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p,
         if (r)
                 return r;
 
+        r = amdgpu_vm_bo_update(adev, fpriv->prt_va, false);
+        if (r)
+                return r;
+
+        r = amdgpu_sync_fence(adev, &p->job->sync,
+                              fpriv->prt_va->last_pt_update);
+        if (r)
+                return r;
+
         if (amdgpu_sriov_vf(adev)) {
                 struct dma_fence *f;
                 bo_va = vm->csa_bo_va;
@@ -855,7 +865,7 @@ static int amdgpu_cs_ib_vm_chunk(struct amdgpu_device *adev,
         if (p->job->vm) {
                 p->job->vm_pd_addr = amdgpu_bo_gpu_offset(vm->page_directory);
 
-                r = amdgpu_bo_vm_update_pte(p, vm);
+                r = amdgpu_bo_vm_update_pte(p);
                 if (r)
                         return r;
         }