drm/amdgpu: explicitly sync VM update to PDs/PTs

Explicitly sync VM updates to the moving fence in PDs and PTs.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c
index 73fec7a0ced57022dac4554e23ec0114328d143e..68b013be383797b0ce4b35a8fb0d853dfd11aee3 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c
@@ -86,6 +86,13 @@ static int amdgpu_vm_cpu_update(struct amdgpu_vm_update_params *p,
 {
        unsigned int i;
        uint64_t value;
+       int r;
+
+       if (bo->tbo.moving) {
+               r = dma_fence_wait(bo->tbo.moving, true);
+               if (r)
+                       return r;
+       }
 
        pe += (unsigned long)amdgpu_bo_kptr(bo);
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c
index 19b7f80758f12eb0e37379f9d35799d6bc448c57..4bbd8ff778eac15f630aef86d3ca771a1a86ee3b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c
@@ -208,6 +208,11 @@ static int amdgpu_vm_sdma_update(struct amdgpu_vm_update_params *p,
        uint64_t *pte;
        int r;
 
+       /* Wait for PD/PT moves to be completed */
+       r = amdgpu_sync_fence(&p->job->sync, bo->tbo.moving, false);
+       if (r)
+               return r;
+
        do {
                ndw = p->num_dw_left;
                ndw -= p->job->ibs->length_dw;