drm/amdgpu: rename ip block helper functions

add device to the name for consistency.

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

1 files changed, 27 insertions, 27 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/si.c b/drivers/gpu/drm/amd/amdgpu/si.c
index 78baddb5d300..543101d5a5ed 100644
--- a/drivers/gpu/drm/amd/amdgpu/si.c
+++ b/drivers/gpu/drm/amd/amdgpu/si.c
@@ -1959,42 +1959,42 @@ int si_set_ip_blocks(struct amdgpu_device *adev)
         case CHIP_VERDE:
         case CHIP_TAHITI:
         case CHIP_PITCAIRN:
-                amdgpu_ip_block_add(adev, &si_common_ip_block);
-                amdgpu_ip_block_add(adev, &gmc_v6_0_ip_block);
-                amdgpu_ip_block_add(adev, &si_ih_ip_block);
-                amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block);
+                amdgpu_device_ip_block_add(adev, &si_common_ip_block);
+                amdgpu_device_ip_block_add(adev, &gmc_v6_0_ip_block);
+                amdgpu_device_ip_block_add(adev, &si_ih_ip_block);
+                amdgpu_device_ip_block_add(adev, &amdgpu_pp_ip_block);
                 if (adev->enable_virtual_display)
-                        amdgpu_ip_block_add(adev, &dce_virtual_ip_block);
+                        amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);
                 else
-                        amdgpu_ip_block_add(adev, &dce_v6_0_ip_block);
-                amdgpu_ip_block_add(adev, &gfx_v6_0_ip_block);
-                amdgpu_ip_block_add(adev, &si_dma_ip_block);
-                /* amdgpu_ip_block_add(adev, &uvd_v3_1_ip_block); */
-                /* amdgpu_ip_block_add(adev, &vce_v1_0_ip_block); */
+                        amdgpu_device_ip_block_add(adev, &dce_v6_0_ip_block);
+                amdgpu_device_ip_block_add(adev, &gfx_v6_0_ip_block);
+                amdgpu_device_ip_block_add(adev, &si_dma_ip_block);
+                /* amdgpu_device_ip_block_add(adev, &uvd_v3_1_ip_block); */
+                /* amdgpu_device_ip_block_add(adev, &vce_v1_0_ip_block); */
                 break;
         case CHIP_OLAND:
-                amdgpu_ip_block_add(adev, &si_common_ip_block);
-                amdgpu_ip_block_add(adev, &gmc_v6_0_ip_block);
-                amdgpu_ip_block_add(adev, &si_ih_ip_block);
-                amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block);
+                amdgpu_device_ip_block_add(adev, &si_common_ip_block);
+                amdgpu_device_ip_block_add(adev, &gmc_v6_0_ip_block);
+                amdgpu_device_ip_block_add(adev, &si_ih_ip_block);
+                amdgpu_device_ip_block_add(adev, &amdgpu_pp_ip_block);
                 if (adev->enable_virtual_display)
-                        amdgpu_ip_block_add(adev, &dce_virtual_ip_block);
+                        amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);
                 else
-                        amdgpu_ip_block_add(adev, &dce_v6_4_ip_block);
-                amdgpu_ip_block_add(adev, &gfx_v6_0_ip_block);
-                amdgpu_ip_block_add(adev, &si_dma_ip_block);
-                /* amdgpu_ip_block_add(adev, &uvd_v3_1_ip_block); */
-                /* amdgpu_ip_block_add(adev, &vce_v1_0_ip_block); */
+                        amdgpu_device_ip_block_add(adev, &dce_v6_4_ip_block);
+                amdgpu_device_ip_block_add(adev, &gfx_v6_0_ip_block);
+                amdgpu_device_ip_block_add(adev, &si_dma_ip_block);
+                /* amdgpu_device_ip_block_add(adev, &uvd_v3_1_ip_block); */
+                /* amdgpu_device_ip_block_add(adev, &vce_v1_0_ip_block); */
                 break;
         case CHIP_HAINAN:
-                amdgpu_ip_block_add(adev, &si_common_ip_block);
-                amdgpu_ip_block_add(adev, &gmc_v6_0_ip_block);
-                amdgpu_ip_block_add(adev, &si_ih_ip_block);
-                amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block);
+                amdgpu_device_ip_block_add(adev, &si_common_ip_block);
+                amdgpu_device_ip_block_add(adev, &gmc_v6_0_ip_block);
+                amdgpu_device_ip_block_add(adev, &si_ih_ip_block);
+                amdgpu_device_ip_block_add(adev, &amdgpu_pp_ip_block);
                 if (adev->enable_virtual_display)
-                        amdgpu_ip_block_add(adev, &dce_virtual_ip_block);
-                amdgpu_ip_block_add(adev, &gfx_v6_0_ip_block);
-                amdgpu_ip_block_add(adev, &si_dma_ip_block);
+                        amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);
+                amdgpu_device_ip_block_add(adev, &gfx_v6_0_ip_block);
+                amdgpu_device_ip_block_add(adev, &si_dma_ip_block);
                 break;
         default:
                 BUG();