drm/amdgpu: allow direct submission in the VM backends v2

This allows us to update page tables directly while in a page fault.

v2: use direct/delayed entities and still wait for moves

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.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
index 7138722ee55f3b6ac5ee499af3ff6f05279a046f..54dcd0bcce1ab1b18a4a40797ac90c25db5c40af 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
@@ -201,6 +201,11 @@ struct amdgpu_vm_update_params {
         */
        struct amdgpu_vm *vm;
 
+       /**
+        * @direct: if changes should be made directly
+        */
+       bool direct;
+
        /**
         * @pages_addr:
         *

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c
index 5222d165abfcf1472d10e99bbacd8b110dcbae92..a2daeadd770fb4c281939e7f36686d88dd173593 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c
@@ -49,13 +49,6 @@ static int amdgpu_vm_cpu_prepare(struct amdgpu_vm_update_params *p, void *owner,
 {
        int r;
 
-       /* Wait for PT BOs to be idle. PTs share the same resv. object
-        * as the root PD BO
-        */
-       r = amdgpu_bo_sync_wait(p->vm->root.base.bo, owner, true);
-       if (unlikely(r))
-               return r;
-
        /* Wait for any BO move to be completed */
        if (exclusive) {
                r = dma_fence_wait(exclusive, true);
@@ -63,7 +56,14 @@ static int amdgpu_vm_cpu_prepare(struct amdgpu_vm_update_params *p, void *owner,
                        return r;
        }
 
-       return 0;
+       /* Don't wait for submissions during page fault */
+       if (p->direct)
+               return 0;
+
+       /* Wait for PT BOs to be idle. PTs share the same resv. object
+        * as the root PD BO
+        */
+       return amdgpu_bo_sync_wait(p->vm->root.base.bo, owner, true);
 }
 
 /**

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c
index 9aecfb370c59e991d8294d789497e372763641be..1520003fe3da9ca1a9de49a389be1cd903929974 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c
@@ -68,17 +68,19 @@ static int amdgpu_vm_sdma_prepare(struct amdgpu_vm_update_params *p,
        if (r)
                return r;
 
+       p->num_dw_left = ndw;
+
+       /* Wait for moves to be completed */
        r = amdgpu_sync_fence(p->adev, &p->job->sync, exclusive, false);
        if (r)
                return r;
 
-       r = amdgpu_sync_resv(p->adev, &p->job->sync, root->tbo.base.resv,
-                            owner, false);
-       if (r)
-               return r;
+       /* Don't wait for any submissions during page fault handling */
+       if (p->direct)
+               return 0;
 
-       p->num_dw_left = ndw;
-       return 0;
+       return amdgpu_sync_resv(p->adev, &p->job->sync, root->tbo.base.resv,
+                               owner, false);
 }
 
 /**
@@ -95,23 +97,23 @@ static int amdgpu_vm_sdma_commit(struct amdgpu_vm_update_params *p,
 {
        struct amdgpu_bo *root = p->vm->root.base.bo;
        struct amdgpu_ib *ib = p->job->ibs;
+       struct drm_sched_entity *entity;
        struct amdgpu_ring *ring;
        struct dma_fence *f;
        int r;
 
-       ring = container_of(p->vm->delayed.rq->sched, struct amdgpu_ring,
-                           sched);
+       entity = p->direct ? &p->vm->direct : &p->vm->delayed;
+       ring = container_of(entity->rq->sched, struct amdgpu_ring, sched);
 
        WARN_ON(ib->length_dw == 0);
        amdgpu_ring_pad_ib(ring, ib);
        WARN_ON(ib->length_dw > p->num_dw_left);
-       r = amdgpu_job_submit(p->job, &p->vm->delayed,
-                             AMDGPU_FENCE_OWNER_VM, &f);
+       r = amdgpu_job_submit(p->job, entity, AMDGPU_FENCE_OWNER_VM, &f);
        if (r)
                goto error;
 
        amdgpu_bo_fence(root, f, true);
-       if (fence)
+       if (fence && !p->direct)
                swap(*fence, f);
        dma_fence_put(f);
        return 0;
@@ -121,7 +123,6 @@ error:
        return r;
 }
 
-
 /**
  * amdgpu_vm_sdma_copy_ptes - copy the PTEs from mapping
  *