diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/cik_sdma.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c index abfa3f2f15fa..1007a98f775b 100644 --- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c +++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c | |||
@@ -796,9 +796,9 @@ static void cik_sdma_vm_set_pte_pde(struct amdgpu_ib *ib, | |||
796 | * @ib: indirect buffer to fill with padding | 796 | * @ib: indirect buffer to fill with padding |
797 | * | 797 | * |
798 | */ | 798 | */ |
799 | static void cik_sdma_vm_pad_ib(struct amdgpu_ib *ib) | 799 | static void cik_sdma_ring_pad_ib(struct amdgpu_ring *ring, struct amdgpu_ib *ib) |
800 | { | 800 | { |
801 | struct amdgpu_sdma_instance *sdma = amdgpu_get_sdma_instance(ib->ring); | 801 | struct amdgpu_sdma_instance *sdma = amdgpu_get_sdma_instance(ring); |
802 | u32 pad_count; | 802 | u32 pad_count; |
803 | int i; | 803 | int i; |
804 | 804 | ||
@@ -1271,6 +1271,7 @@ static const struct amdgpu_ring_funcs cik_sdma_ring_funcs = { | |||
1271 | .test_ring = cik_sdma_ring_test_ring, | 1271 | .test_ring = cik_sdma_ring_test_ring, |
1272 | .test_ib = cik_sdma_ring_test_ib, | 1272 | .test_ib = cik_sdma_ring_test_ib, |
1273 | .insert_nop = cik_sdma_ring_insert_nop, | 1273 | .insert_nop = cik_sdma_ring_insert_nop, |
1274 | .pad_ib = cik_sdma_ring_pad_ib, | ||
1274 | }; | 1275 | }; |
1275 | 1276 | ||
1276 | static void cik_sdma_set_ring_funcs(struct amdgpu_device *adev) | 1277 | static void cik_sdma_set_ring_funcs(struct amdgpu_device *adev) |
@@ -1367,7 +1368,6 @@ static const struct amdgpu_vm_pte_funcs cik_sdma_vm_pte_funcs = { | |||
1367 | .copy_pte = cik_sdma_vm_copy_pte, | 1368 | .copy_pte = cik_sdma_vm_copy_pte, |
1368 | .write_pte = cik_sdma_vm_write_pte, | 1369 | .write_pte = cik_sdma_vm_write_pte, |
1369 | .set_pte_pde = cik_sdma_vm_set_pte_pde, | 1370 | .set_pte_pde = cik_sdma_vm_set_pte_pde, |
1370 | .pad_ib = cik_sdma_vm_pad_ib, | ||
1371 | }; | 1371 | }; |
1372 | 1372 | ||
1373 | static void cik_sdma_set_vm_pte_funcs(struct amdgpu_device *adev) | 1373 | static void cik_sdma_set_vm_pte_funcs(struct amdgpu_device *adev) |