]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
drm/amdgpu: sync the VM PD/PT before clearing it
authorChristian König <christian.koenig@amd.com>
Sun, 4 Feb 2018 18:36:52 +0000 (19:36 +0100)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 19 Feb 2018 19:19:26 +0000 (14:19 -0500)
Otherwise we might overwrite stuff which is still in use.

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>
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c

index 18ce47608bf1fe8317eff4f2e67fae51a117a02b..0572d6072baafdbfecb965e37f2a8c761a67c52c 100644 (file)
@@ -329,6 +329,11 @@ static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,
        amdgpu_ring_pad_ib(ring, &job->ibs[0]);
 
        WARN_ON(job->ibs[0].length_dw > 64);
+       r = amdgpu_sync_resv(adev, &job->sync, bo->tbo.resv,
+                            AMDGPU_FENCE_OWNER_UNDEFINED, false);
+       if (r)
+               goto error_free;
+
        r = amdgpu_job_submit(job, ring, &vm->entity,
                              AMDGPU_FENCE_OWNER_UNDEFINED, &fence);
        if (r)