diff options
| author |   Christian König <christian.koenig@amd.com> | 2019-07-19 14:41:12 +0200 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2019-09-16 10:42:55 -0500 |
| commit | a2cf324785a6dea0a221f5cdfb945b59d2153eeb (patch) | |
| tree | ac2fb9c611d43071a020b02629217f35a030b602 /drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | |
| parent | drm/ttm: return -EBUSY on pipelining with no_gpu_wait (v2) (diff) | |
| download | wireguard-linux-a2cf324785a6dea0a221f5cdfb945b59d2153eeb.tar.xz wireguard-linux-a2cf324785a6dea0a221f5cdfb945b59d2153eeb.zip | |
drm/amdgpu: split the VM entity into direct and delayed
For page fault handling we need to use a direct update which can't be
blocked by ongoing user CS.
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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c index 61fc584cbb1a..9aecfb370c59 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c @@ -99,12 +99,13 @@ static int amdgpu_vm_sdma_commit(struct amdgpu_vm_update_params *p, struct dma_fence *f; int r; - ring = container_of(p->vm->entity.rq->sched, struct amdgpu_ring, sched); + ring = container_of(p->vm->delayed.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->entity, + r = amdgpu_job_submit(p->job, &p->vm->delayed, AMDGPU_FENCE_OWNER_VM, &f); if (r) goto error; |