diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2017-12-14 16:03:43 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-12-18 10:59:07 -0500 |
commit | 131b4b3686b701079e8fb82eb9384c8acdd3fc72 (patch) | |
tree | a85a6eeb96609d29f86a16c749282ec59b735661 /drivers/gpu/drm/amd/amdgpu/cik_sdma.c | |
parent | 75758255dc0fae76a845fd5185cfcdf60990cc99 (diff) |
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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/cik_sdma.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c index ed26dcbc4f79..e406c93d01d6 100644 --- 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) | |||
626 | u32 tmp; | 626 | u32 tmp; |
627 | u64 gpu_addr; | 627 | u64 gpu_addr; |
628 | 628 | ||
629 | r = amdgpu_wb_get(adev, &index); | 629 | r = amdgpu_device_wb_get(adev, &index); |
630 | if (r) { | 630 | if (r) { |
631 | dev_err(adev->dev, "(%d) failed to allocate wb slot\n", r); | 631 | dev_err(adev->dev, "(%d) failed to allocate wb slot\n", r); |
632 | return r; | 632 | return r; |
@@ -639,7 +639,7 @@ static int cik_sdma_ring_test_ring(struct amdgpu_ring *ring) | |||
639 | r = amdgpu_ring_alloc(ring, 5); | 639 | r = amdgpu_ring_alloc(ring, 5); |
640 | if (r) { | 640 | if (r) { |
641 | DRM_ERROR("amdgpu: dma failed to lock ring %d (%d).\n", ring->idx, r); | 641 | DRM_ERROR("amdgpu: dma failed to lock ring %d (%d).\n", ring->idx, r); |
642 | amdgpu_wb_free(adev, index); | 642 | amdgpu_device_wb_free(adev, index); |
643 | return r; | 643 | return r; |
644 | } | 644 | } |
645 | amdgpu_ring_write(ring, SDMA_PACKET(SDMA_OPCODE_WRITE, SDMA_WRITE_SUB_OPCODE_LINEAR, 0)); | 645 | 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) | |||
663 | ring->idx, tmp); | 663 | ring->idx, tmp); |
664 | r = -EINVAL; | 664 | r = -EINVAL; |
665 | } | 665 | } |
666 | amdgpu_wb_free(adev, index); | 666 | amdgpu_device_wb_free(adev, index); |
667 | 667 | ||
668 | return r; | 668 | return r; |
669 | } | 669 | } |
@@ -686,7 +686,7 @@ static int cik_sdma_ring_test_ib(struct amdgpu_ring *ring, long timeout) | |||
686 | u64 gpu_addr; | 686 | u64 gpu_addr; |
687 | long r; | 687 | long r; |
688 | 688 | ||
689 | r = amdgpu_wb_get(adev, &index); | 689 | r = amdgpu_device_wb_get(adev, &index); |
690 | if (r) { | 690 | if (r) { |
691 | dev_err(adev->dev, "(%ld) failed to allocate wb slot\n", r); | 691 | dev_err(adev->dev, "(%ld) failed to allocate wb slot\n", r); |
692 | return r; | 692 | return r; |
@@ -735,7 +735,7 @@ err1: | |||
735 | amdgpu_ib_free(adev, &ib, NULL); | 735 | amdgpu_ib_free(adev, &ib, NULL); |
736 | dma_fence_put(f); | 736 | dma_fence_put(f); |
737 | err0: | 737 | err0: |
738 | amdgpu_wb_free(adev, index); | 738 | amdgpu_device_wb_free(adev, index); |
739 | return r; | 739 | return r; |
740 | } | 740 | } |
741 | 741 | ||