drm/amdgpu: rename amdgpu_wb_* functions

add device for consistency.

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

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index c15b944..81c1ddb 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -1171,8 +1171,8 @@ struct amdgpu_wb {
        unsigned long           used[DIV_ROUND_UP(AMDGPU_MAX_WB, BITS_PER_LONG)];
 };
 
-int amdgpu_wb_get(struct amdgpu_device *adev, u32 *wb);
-void amdgpu_wb_free(struct amdgpu_device *adev, u32 wb);
+int amdgpu_device_wb_get(struct amdgpu_device *adev, u32 *wb);
+void amdgpu_device_wb_free(struct amdgpu_device *adev, u32 wb);
 
 void amdgpu_get_pcie_info(struct amdgpu_device *adev);
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index ec078a9..7b44ca2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -530,7 +530,7 @@ static int amdgpu_device_wb_init(struct amdgpu_device *adev)
 }
 
 /**
- * amdgpu_wb_get - Allocate a wb entry
+ * amdgpu_device_wb_get - Allocate a wb entry
  *
  * @adev: amdgpu_device pointer
  * @wb: wb index
@@ -538,7 +538,7 @@ static int amdgpu_device_wb_init(struct amdgpu_device *adev)
  * Allocate a wb slot for use by the driver (all asics).
  * Returns 0 on success or -EINVAL on failure.
  */
-int amdgpu_wb_get(struct amdgpu_device *adev, u32 *wb)
+int amdgpu_device_wb_get(struct amdgpu_device *adev, u32 *wb)
 {
        unsigned long offset = find_first_zero_bit(adev->wb.used, adev->wb.num_wb);
 
@@ -552,14 +552,14 @@ int amdgpu_wb_get(struct amdgpu_device *adev, u32 *wb)
 }
 
 /**
- * amdgpu_wb_free - Free a wb entry
+ * amdgpu_device_wb_free - Free a wb entry
  *
  * @adev: amdgpu_device pointer
  * @wb: wb index
  *
  * Free a wb slot allocated for use by the driver (all asics)
  */
-void amdgpu_wb_free(struct amdgpu_device *adev, u32 wb)
+void amdgpu_device_wb_free(struct amdgpu_device *adev, u32 wb)
 {
        if (wb < adev->wb.num_wb)
                __clear_bit(wb >> 3, adev->wb.used);

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
index ef04336..bb40d25 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
@@ -203,7 +203,7 @@ int amdgpu_gfx_kiq_init_ring(struct amdgpu_device *adev,
 
        spin_lock_init(&kiq->ring_lock);
 
-       r = amdgpu_wb_get(adev, &adev->virt.reg_val_offs);
+       r = amdgpu_device_wb_get(adev, &adev->virt.reg_val_offs);
        if (r)
                return r;
 
@@ -229,7 +229,7 @@ int amdgpu_gfx_kiq_init_ring(struct amdgpu_device *adev,
 void amdgpu_gfx_kiq_free_ring(struct amdgpu_ring *ring,
                              struct amdgpu_irq_src *irq)
 {
-       amdgpu_wb_free(ring->adev, ring->adev->virt.reg_val_offs);
+       amdgpu_device_wb_free(ring->adev, ring->adev->virt.reg_val_offs);
        amdgpu_ring_fini(ring);
 }
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c
index f5f27e4..06373d4 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c
@@ -92,15 +92,15 @@ int amdgpu_ih_ring_init(struct amdgpu_device *adev, unsigned ring_size,
                }
                return 0;
        } else {
-               r = amdgpu_wb_get(adev, &adev->irq.ih.wptr_offs);
+               r = amdgpu_device_wb_get(adev, &adev->irq.ih.wptr_offs);
                if (r) {
                        dev_err(adev->dev, "(%d) ih wptr_offs wb alloc failed\n", r);
                        return r;
                }
 
-               r = amdgpu_wb_get(adev, &adev->irq.ih.rptr_offs);
+               r = amdgpu_device_wb_get(adev, &adev->irq.ih.rptr_offs);
                if (r) {
-                       amdgpu_wb_free(adev, adev->irq.ih.wptr_offs);
+                       amdgpu_device_wb_free(adev, adev->irq.ih.wptr_offs);
                        dev_err(adev->dev, "(%d) ih rptr_offs wb alloc failed\n", r);
                        return r;
                }
@@ -133,8 +133,8 @@ void amdgpu_ih_ring_fini(struct amdgpu_device *adev)
                amdgpu_bo_free_kernel(&adev->irq.ih.ring_obj,
                                      &adev->irq.ih.gpu_addr,
                                      (void **)&adev->irq.ih.ring);
-               amdgpu_wb_free(adev, adev->irq.ih.wptr_offs);
-               amdgpu_wb_free(adev, adev->irq.ih.rptr_offs);
+               amdgpu_device_wb_free(adev, adev->irq.ih.wptr_offs);
+               amdgpu_device_wb_free(adev, adev->irq.ih.rptr_offs);
        }
 }
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
index 41c75f9..13044e6 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
@@ -263,25 +263,25 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring,
                        return r;
        }
 
-       r = amdgpu_wb_get(adev, &ring->rptr_offs);
+       r = amdgpu_device_wb_get(adev, &ring->rptr_offs);
        if (r) {
                dev_err(adev->dev, "(%d) ring rptr_offs wb alloc failed\n", r);
                return r;
        }
 
-       r = amdgpu_wb_get(adev, &ring->wptr_offs);
+       r = amdgpu_device_wb_get(adev, &ring->wptr_offs);
        if (r) {
                dev_err(adev->dev, "(%d) ring wptr_offs wb alloc failed\n", r);
                return r;
        }
 
-       r = amdgpu_wb_get(adev, &ring->fence_offs);
+       r = amdgpu_device_wb_get(adev, &ring->fence_offs);
        if (r) {
                dev_err(adev->dev, "(%d) ring fence_offs wb alloc failed\n", r);
                return r;
        }
 
-       r = amdgpu_wb_get(adev, &ring->cond_exe_offs);
+       r = amdgpu_device_wb_get(adev, &ring->cond_exe_offs);
        if (r) {
                dev_err(adev->dev, "(%d) ring cond_exec_polling wb alloc failed\n", r);
                return r;
@@ -348,11 +348,11 @@ void amdgpu_ring_fini(struct amdgpu_ring *ring)
        if (!(ring->adev) || !(ring->adev->rings[ring->idx]))
                return;
 
-       amdgpu_wb_free(ring->adev, ring->rptr_offs);
-       amdgpu_wb_free(ring->adev, ring->wptr_offs);
+       amdgpu_device_wb_free(ring->adev, ring->rptr_offs);
+       amdgpu_device_wb_free(ring->adev, ring->wptr_offs);
 
-       amdgpu_wb_free(ring->adev, ring->cond_exe_offs);
-       amdgpu_wb_free(ring->adev, ring->fence_offs);
+       amdgpu_device_wb_free(ring->adev, ring->cond_exe_offs);
+       amdgpu_device_wb_free(ring->adev, ring->fence_offs);
 
        amdgpu_bo_free_kernel(&ring->ring_obj,
                              &ring->gpu_addr,

diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
index ed26dcb..e406c93 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
@@ -626,7 +626,7 @@ static int cik_sdma_ring_test_ring(struct amdgpu_ring *ring)
        u32 tmp;
        u64 gpu_addr;
 
-       r = amdgpu_wb_get(adev, &index);
+       r = amdgpu_device_wb_get(adev, &index);
        if (r) {
                dev_err(adev->dev, "(%d) failed to allocate wb slot\n", r);
                return r;
@@ -639,7 +639,7 @@ static int cik_sdma_ring_test_ring(struct amdgpu_ring *ring)
        r = amdgpu_ring_alloc(ring, 5);
        if (r) {
                DRM_ERROR("amdgpu: dma failed to lock ring %d (%d).\n", ring->idx, r);
-               amdgpu_wb_free(adev, index);
+               amdgpu_device_wb_free(adev, index);
                return r;
        }
        amdgpu_ring_write(ring, SDMA_PACKET(SDMA_OPCODE_WRITE, SDMA_WRITE_SUB_OPCODE_LINEAR, 0));
@@ -663,7 +663,7 @@ static int cik_sdma_ring_test_ring(struct amdgpu_ring *ring)
                          ring->idx, tmp);
                r = -EINVAL;
        }
-       amdgpu_wb_free(adev, index);
+       amdgpu_device_wb_free(adev, index);
 
        return r;
 }
@@ -686,7 +686,7 @@ static int cik_sdma_ring_test_ib(struct amdgpu_ring *ring, long timeout)
        u64 gpu_addr;
        long r;
 
-       r = amdgpu_wb_get(adev, &index);
+       r = amdgpu_device_wb_get(adev, &index);
        if (r) {
                dev_err(adev->dev, "(%ld) failed to allocate wb slot\n", r);
                return r;
@@ -735,7 +735,7 @@ err1:
        amdgpu_ib_free(adev, &ib, NULL);
        dma_fence_put(f);
 err0:
-       amdgpu_wb_free(adev, index);
+       amdgpu_device_wb_free(adev, index);
        return r;
 }
 

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
index 121e628..0c5b91a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
@@ -600,7 +600,7 @@ static int sdma_v2_4_ring_test_ring(struct amdgpu_ring *ring)
        u32 tmp;
        u64 gpu_addr;
 
-       r = amdgpu_wb_get(adev, &index);
+       r = amdgpu_device_wb_get(adev, &index);
        if (r) {
                dev_err(adev->dev, "(%d) failed to allocate wb slot\n", r);
                return r;
@@ -613,7 +613,7 @@ static int sdma_v2_4_ring_test_ring(struct amdgpu_ring *ring)
        r = amdgpu_ring_alloc(ring, 5);
        if (r) {
                DRM_ERROR("amdgpu: dma failed to lock ring %d (%d).\n", ring->idx, r);
-               amdgpu_wb_free(adev, index);
+               amdgpu_device_wb_free(adev, index);
                return r;
        }
 
@@ -639,7 +639,7 @@ static int sdma_v2_4_ring_test_ring(struct amdgpu_ring *ring)
                          ring->idx, tmp);
                r = -EINVAL;
        }
-       amdgpu_wb_free(adev, index);
+       amdgpu_device_wb_free(adev, index);
 
        return r;
 }
@@ -662,7 +662,7 @@ static int sdma_v2_4_ring_test_ib(struct amdgpu_ring *ring, long timeout)
        u64 gpu_addr;
        long r;
 
-       r = amdgpu_wb_get(adev, &index);
+       r = amdgpu_device_wb_get(adev, &index);
        if (r) {
                dev_err(adev->dev, "(%ld) failed to allocate wb slot\n", r);
                return r;
@@ -715,7 +715,7 @@ err1:
        amdgpu_ib_free(adev, &ib, NULL);
        dma_fence_put(f);
 err0:
-       amdgpu_wb_free(adev, index);
+       amdgpu_device_wb_free(adev, index);
        return r;
 }
 

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
index 41c60f5..4e031a2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
@@ -867,7 +867,7 @@ static int sdma_v3_0_ring_test_ring(struct amdgpu_ring *ring)
        u32 tmp;
        u64 gpu_addr;
 
-       r = amdgpu_wb_get(adev, &index);
+       r = amdgpu_device_wb_get(adev, &index);
        if (r) {
                dev_err(adev->dev, "(%d) failed to allocate wb slot\n", r);
                return r;
@@ -880,7 +880,7 @@ static int sdma_v3_0_ring_test_ring(struct amdgpu_ring *ring)
        r = amdgpu_ring_alloc(ring, 5);
        if (r) {
                DRM_ERROR("amdgpu: dma failed to lock ring %d (%d).\n", ring->idx, r);
-               amdgpu_wb_free(adev, index);
+               amdgpu_device_wb_free(adev, index);
                return r;
        }
 
@@ -906,7 +906,7 @@ static int sdma_v3_0_ring_test_ring(struct amdgpu_ring *ring)
                          ring->idx, tmp);
                r = -EINVAL;
        }
-       amdgpu_wb_free(adev, index);
+       amdgpu_device_wb_free(adev, index);
 
        return r;
 }
@@ -929,7 +929,7 @@ static int sdma_v3_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
        u64 gpu_addr;
        long r;
 
-       r = amdgpu_wb_get(adev, &index);
+       r = amdgpu_device_wb_get(adev, &index);
        if (r) {
                dev_err(adev->dev, "(%ld) failed to allocate wb slot\n", r);
                return r;
@@ -981,7 +981,7 @@ err1:
        amdgpu_ib_free(adev, &ib, NULL);
        dma_fence_put(f);
 err0:
-       amdgpu_wb_free(adev, index);
+       amdgpu_device_wb_free(adev, index);
        return r;
 }
 

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
index 79e82bf..73477c5 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
@@ -869,7 +869,7 @@ static int sdma_v4_0_ring_test_ring(struct amdgpu_ring *ring)
        u32 tmp;
        u64 gpu_addr;
 
-       r = amdgpu_wb_get(adev, &index);
+       r = amdgpu_device_wb_get(adev, &index);
        if (r) {
                dev_err(adev->dev, "(%d) failed to allocate wb slot\n", r);
                return r;
@@ -882,7 +882,7 @@ static int sdma_v4_0_ring_test_ring(struct amdgpu_ring *ring)
        r = amdgpu_ring_alloc(ring, 5);
        if (r) {
                DRM_ERROR("amdgpu: dma failed to lock ring %d (%d).\n", ring->idx, r);
-               amdgpu_wb_free(adev, index);
+               amdgpu_device_wb_free(adev, index);
                return r;
        }
 
@@ -908,7 +908,7 @@ static int sdma_v4_0_ring_test_ring(struct amdgpu_ring *ring)
                          ring->idx, tmp);
                r = -EINVAL;
        }
-       amdgpu_wb_free(adev, index);
+       amdgpu_device_wb_free(adev, index);
 
        return r;
 }
@@ -931,7 +931,7 @@ static int sdma_v4_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
        u32 tmp = 0;
        u64 gpu_addr;
 
-       r = amdgpu_wb_get(adev, &index);
+       r = amdgpu_device_wb_get(adev, &index);
        if (r) {
                dev_err(adev->dev, "(%ld) failed to allocate wb slot\n", r);
                return r;
@@ -983,7 +983,7 @@ err1:
        amdgpu_ib_free(adev, &ib, NULL);
        dma_fence_put(f);
 err0:
-       amdgpu_wb_free(adev, index);
+       amdgpu_device_wb_free(adev, index);
        return r;
 }
 

diff --git a/drivers/gpu/drm/amd/amdgpu/si_dma.c b/drivers/gpu/drm/amd/amdgpu/si_dma.c
index ee469a9..9adca5d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/si_dma.c
+++ b/drivers/gpu/drm/amd/amdgpu/si_dma.c
@@ -221,7 +221,7 @@ static int si_dma_ring_test_ring(struct amdgpu_ring *ring)
        u32 tmp;
        u64 gpu_addr;
 
-       r = amdgpu_wb_get(adev, &index);
+       r = amdgpu_device_wb_get(adev, &index);
        if (r) {
                dev_err(adev->dev, "(%d) failed to allocate wb slot\n", r);
                return r;
@@ -234,7 +234,7 @@ static int si_dma_ring_test_ring(struct amdgpu_ring *ring)
        r = amdgpu_ring_alloc(ring, 4);
        if (r) {
                DRM_ERROR("amdgpu: dma failed to lock ring %d (%d).\n", ring->idx, r);
-               amdgpu_wb_free(adev, index);
+               amdgpu_device_wb_free(adev, index);
                return r;
        }
 
@@ -258,7 +258,7 @@ static int si_dma_ring_test_ring(struct amdgpu_ring *ring)
                          ring->idx, tmp);
                r = -EINVAL;
        }
-       amdgpu_wb_free(adev, index);
+       amdgpu_device_wb_free(adev, index);
 
        return r;
 }
@@ -281,7 +281,7 @@ static int si_dma_ring_test_ib(struct amdgpu_ring *ring, long timeout)
        u64 gpu_addr;
        long r;
 
-       r = amdgpu_wb_get(adev, &index);
+       r = amdgpu_device_wb_get(adev, &index);
        if (r) {
                dev_err(adev->dev, "(%ld) failed to allocate wb slot\n", r);
                return r;
@@ -328,7 +328,7 @@ err1:
        amdgpu_ib_free(adev, &ib, NULL);
        dma_fence_put(f);
 err0:
-       amdgpu_wb_free(adev, index);
+       amdgpu_device_wb_free(adev, index);
        return r;
 }