diff options
author | Rex Zhu <Rex.Zhu@amd.com> | 2018-11-01 01:42:42 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-11-05 15:49:37 -0500 |
commit | ccf191f8aabf8cb7bb01e4efae7bdb73614c745b (patch) | |
tree | eafac3d749e02c72472f58ca0c52397022938ddb | |
parent | 3a10f6e8aa14f3f512e59da04397e002d2810111 (diff) |
drm/amdgpu: Refine function name
there is no functional changes.just
refine function name to keep
consistence with other files.
change amdgpu_get_sdma_instance to
amdgpu_sdma_get_instance_from_ring.
suggested by alex.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Flora Cui <flora.cui@amd.com>
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c index 0fb9907494bb..c91223021ab4 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | |||
@@ -28,7 +28,7 @@ | |||
28 | * GPU SDMA IP block helpers function. | 28 | * GPU SDMA IP block helpers function. |
29 | */ | 29 | */ |
30 | 30 | ||
31 | struct amdgpu_sdma_instance * amdgpu_get_sdma_instance(struct amdgpu_ring *ring) | 31 | struct amdgpu_sdma_instance *amdgpu_sdma_get_instance_from_ring(struct amdgpu_ring *ring) |
32 | { | 32 | { |
33 | struct amdgpu_device *adev = ring->adev; | 33 | struct amdgpu_device *adev = ring->adev; |
34 | int i; | 34 | int i; |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h index 479a2459e558..664f54930560 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | |||
@@ -94,6 +94,6 @@ struct amdgpu_buffer_funcs { | |||
94 | #define amdgpu_emit_fill_buffer(adev, ib, s, d, b) (adev)->mman.buffer_funcs->emit_fill_buffer((ib), (s), (d), (b)) | 94 | #define amdgpu_emit_fill_buffer(adev, ib, s, d, b) (adev)->mman.buffer_funcs->emit_fill_buffer((ib), (s), (d), (b)) |
95 | 95 | ||
96 | struct amdgpu_sdma_instance * | 96 | struct amdgpu_sdma_instance * |
97 | amdgpu_get_sdma_instance(struct amdgpu_ring *ring); | 97 | amdgpu_sdma_get_instance_from_ring(struct amdgpu_ring *ring); |
98 | 98 | ||
99 | #endif | 99 | #endif |
diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c index ad58dcec223e..45795191de1f 100644 --- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c +++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c | |||
@@ -198,7 +198,7 @@ static void cik_sdma_ring_set_wptr(struct amdgpu_ring *ring) | |||
198 | 198 | ||
199 | static void cik_sdma_ring_insert_nop(struct amdgpu_ring *ring, uint32_t count) | 199 | static void cik_sdma_ring_insert_nop(struct amdgpu_ring *ring, uint32_t count) |
200 | { | 200 | { |
201 | struct amdgpu_sdma_instance *sdma = amdgpu_get_sdma_instance(ring); | 201 | struct amdgpu_sdma_instance *sdma = amdgpu_sdma_get_instance_from_ring(ring); |
202 | int i; | 202 | int i; |
203 | 203 | ||
204 | for (i = 0; i < count; i++) | 204 | for (i = 0; i < count; i++) |
@@ -805,7 +805,7 @@ static void cik_sdma_vm_set_pte_pde(struct amdgpu_ib *ib, uint64_t pe, | |||
805 | */ | 805 | */ |
806 | static void cik_sdma_ring_pad_ib(struct amdgpu_ring *ring, struct amdgpu_ib *ib) | 806 | static void cik_sdma_ring_pad_ib(struct amdgpu_ring *ring, struct amdgpu_ib *ib) |
807 | { | 807 | { |
808 | struct amdgpu_sdma_instance *sdma = amdgpu_get_sdma_instance(ring); | 808 | struct amdgpu_sdma_instance *sdma = amdgpu_sdma_get_instance_from_ring(ring); |
809 | u32 pad_count; | 809 | u32 pad_count; |
810 | int i; | 810 | int i; |
811 | 811 | ||
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c index fb2a066c0ac9..9f3cb2aec7c2 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | |||
@@ -225,7 +225,7 @@ static void sdma_v2_4_ring_set_wptr(struct amdgpu_ring *ring) | |||
225 | 225 | ||
226 | static void sdma_v2_4_ring_insert_nop(struct amdgpu_ring *ring, uint32_t count) | 226 | static void sdma_v2_4_ring_insert_nop(struct amdgpu_ring *ring, uint32_t count) |
227 | { | 227 | { |
228 | struct amdgpu_sdma_instance *sdma = amdgpu_get_sdma_instance(ring); | 228 | struct amdgpu_sdma_instance *sdma = amdgpu_sdma_get_instance_from_ring(ring); |
229 | int i; | 229 | int i; |
230 | 230 | ||
231 | for (i = 0; i < count; i++) | 231 | for (i = 0; i < count; i++) |
@@ -743,7 +743,7 @@ static void sdma_v2_4_vm_set_pte_pde(struct amdgpu_ib *ib, uint64_t pe, | |||
743 | */ | 743 | */ |
744 | static void sdma_v2_4_ring_pad_ib(struct amdgpu_ring *ring, struct amdgpu_ib *ib) | 744 | static void sdma_v2_4_ring_pad_ib(struct amdgpu_ring *ring, struct amdgpu_ib *ib) |
745 | { | 745 | { |
746 | struct amdgpu_sdma_instance *sdma = amdgpu_get_sdma_instance(ring); | 746 | struct amdgpu_sdma_instance *sdma = amdgpu_sdma_get_instance_from_ring(ring); |
747 | u32 pad_count; | 747 | u32 pad_count; |
748 | int i; | 748 | int i; |
749 | 749 | ||
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c index a9848d28707d..b6a25f92d566 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | |||
@@ -399,7 +399,7 @@ static void sdma_v3_0_ring_set_wptr(struct amdgpu_ring *ring) | |||
399 | 399 | ||
400 | static void sdma_v3_0_ring_insert_nop(struct amdgpu_ring *ring, uint32_t count) | 400 | static void sdma_v3_0_ring_insert_nop(struct amdgpu_ring *ring, uint32_t count) |
401 | { | 401 | { |
402 | struct amdgpu_sdma_instance *sdma = amdgpu_get_sdma_instance(ring); | 402 | struct amdgpu_sdma_instance *sdma = amdgpu_sdma_get_instance_from_ring(ring); |
403 | int i; | 403 | int i; |
404 | 404 | ||
405 | for (i = 0; i < count; i++) | 405 | for (i = 0; i < count; i++) |
@@ -1014,7 +1014,7 @@ static void sdma_v3_0_vm_set_pte_pde(struct amdgpu_ib *ib, uint64_t pe, | |||
1014 | */ | 1014 | */ |
1015 | static void sdma_v3_0_ring_pad_ib(struct amdgpu_ring *ring, struct amdgpu_ib *ib) | 1015 | static void sdma_v3_0_ring_pad_ib(struct amdgpu_ring *ring, struct amdgpu_ib *ib) |
1016 | { | 1016 | { |
1017 | struct amdgpu_sdma_instance *sdma = amdgpu_get_sdma_instance(ring); | 1017 | struct amdgpu_sdma_instance *sdma = amdgpu_sdma_get_instance_from_ring(ring); |
1018 | u32 pad_count; | 1018 | u32 pad_count; |
1019 | int i; | 1019 | int i; |
1020 | 1020 | ||
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c index e740953110d8..e39a09eb0fa1 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | |||
@@ -477,7 +477,7 @@ static void sdma_v4_0_page_ring_set_wptr(struct amdgpu_ring *ring) | |||
477 | 477 | ||
478 | static void sdma_v4_0_ring_insert_nop(struct amdgpu_ring *ring, uint32_t count) | 478 | static void sdma_v4_0_ring_insert_nop(struct amdgpu_ring *ring, uint32_t count) |
479 | { | 479 | { |
480 | struct amdgpu_sdma_instance *sdma = amdgpu_get_sdma_instance(ring); | 480 | struct amdgpu_sdma_instance *sdma = amdgpu_sdma_get_instance_from_ring(ring); |
481 | int i; | 481 | int i; |
482 | 482 | ||
483 | for (i = 0; i < count; i++) | 483 | for (i = 0; i < count; i++) |
@@ -1376,7 +1376,7 @@ static void sdma_v4_0_vm_set_pte_pde(struct amdgpu_ib *ib, | |||
1376 | */ | 1376 | */ |
1377 | static void sdma_v4_0_ring_pad_ib(struct amdgpu_ring *ring, struct amdgpu_ib *ib) | 1377 | static void sdma_v4_0_ring_pad_ib(struct amdgpu_ring *ring, struct amdgpu_ib *ib) |
1378 | { | 1378 | { |
1379 | struct amdgpu_sdma_instance *sdma = amdgpu_get_sdma_instance(ring); | 1379 | struct amdgpu_sdma_instance *sdma = amdgpu_sdma_get_instance_from_ring(ring); |
1380 | u32 pad_count; | 1380 | u32 pad_count; |
1381 | int i; | 1381 | int i; |
1382 | 1382 | ||