[PATCH 14/42] drm/amdgpu/cik_sdma: switch to using job for IBs

[Alex Deucher]

Switch to using a job structure for IBs.

Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 31 ++++++++++++++++-----------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c 
b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
index 9e8715b4739da..e2ca96f5a7cfb 100644
--- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
@@ -652,7 +652,8 @@ static int cik_sdma_ring_test_ring(struct amdgpu_ring *ring)
 static int cik_sdma_ring_test_ib(struct amdgpu_ring *ring, long timeout)
 {
        struct amdgpu_device *adev = ring->adev;
-       struct amdgpu_ib ib;
+       struct amdgpu_job *job;
+       struct amdgpu_ib *ib;
        struct dma_fence *f = NULL;
        unsigned index;
        u32 tmp = 0;
@@ -666,22 +667,27 @@ static int cik_sdma_ring_test_ib(struct amdgpu_ring 
*ring, long timeout)
        gpu_addr = adev->wb.gpu_addr + (index * 4);
        tmp = 0xCAFEDEAD;
        adev->wb.wb[index] = cpu_to_le32(tmp);
-       memset(&ib, 0, sizeof(ib));
-       r = amdgpu_ib_get(adev, NULL, 256,
-                                       AMDGPU_IB_POOL_DIRECT, &ib);
+
+       r = amdgpu_job_alloc_with_ib(ring->adev, NULL, NULL, 256,
+                                    AMDGPU_IB_POOL_DIRECT, &job,
+                                    AMDGPU_KERNEL_JOB_ID_SDMA_RING_TEST);
        if (r)
                goto err0;
+       ib = &job->ibs[0];
 
-       ib.ptr[0] = SDMA_PACKET(SDMA_OPCODE_WRITE,
+       ib->ptr[0] = SDMA_PACKET(SDMA_OPCODE_WRITE,
                                SDMA_WRITE_SUB_OPCODE_LINEAR, 0);
-       ib.ptr[1] = lower_32_bits(gpu_addr);
-       ib.ptr[2] = upper_32_bits(gpu_addr);
-       ib.ptr[3] = 1;
-       ib.ptr[4] = 0xDEADBEEF;
-       ib.length_dw = 5;
-       r = amdgpu_ib_schedule(ring, 1, &ib, NULL, &f);
-       if (r)
+       ib->ptr[1] = lower_32_bits(gpu_addr);
+       ib->ptr[2] = upper_32_bits(gpu_addr);
+       ib->ptr[3] = 1;
+       ib->ptr[4] = 0xDEADBEEF;
+       ib->length_dw = 5;
+
+       r = amdgpu_job_submit_direct(job, ring, &f);
+       if (r) {
+               amdgpu_job_free(job);
                goto err1;
+       }
 
        r = dma_fence_wait_timeout(f, false, timeout);
        if (r == 0) {
@@ -697,7 +703,6 @@ static int cik_sdma_ring_test_ib(struct amdgpu_ring *ring, 
long timeout)
                r = -EINVAL;
 
 err1:
-       amdgpu_ib_free(&ib, NULL);
        dma_fence_put(f);
 err0:
        amdgpu_device_wb_free(adev, index);
-- 
2.52.0