[PATCH 2/2] drm/amdgpu: use common function to map ip for aqua_vanjaram

[Gao, Likun]

[AMD Official Use Only - AMD Internal Distribution Only]

From: Likun Gao <Likun.Gao at amd.com>

Transfer to use function amdgpu_ip_map_init to map ip instance for aqua_vanjaram instead of operation on different ASIC.

Signed-off-by: Likun Gao <Likun.Gao at amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 74 +---------------------
 drivers/gpu/drm/amd/amdgpu/soc15.h         |  1 -
 2 files changed, 2 insertions(+), 73 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c b/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c
index ae071985f26e..edf479319f82 100644
--- a/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c
+++ b/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c
@@ -29,6 +29,7 @@
 #include "gfx_v9_4_3.h"
 #include "gfxhub_v1_2.h"
 #include "sdma_v4_4_2.h"
+#include "amdgpu_ip.h"

 #define XCP_INST_MASK(num_inst, xcp_id)                                        \
        (num_inst ? GENMASK(num_inst - 1, 0) << (xcp_id * num_inst) : 0) @@ -219,77 +220,6 @@ static int aqua_vanjaram_select_scheds(
        return 0;
 }

-static int8_t aqua_vanjaram_logical_to_dev_inst(struct amdgpu_device *adev,
-                                        enum amd_hw_ip_block_type block,
-                                        int8_t inst)
-{
-       int8_t dev_inst;
-
-       switch (block) {
-       case GC_HWIP:
-       case SDMA0_HWIP:
-       /* Both JPEG and VCN as JPEG is only alias of VCN */
-       case VCN_HWIP:
-               dev_inst = adev->ip_map.dev_inst[block][inst];
-               break;
-       default:
-               /* For rest of the IPs, no look up required.
-                * Assume 'logical instance == physical instance' for all configs. */
-               dev_inst = inst;
-               break;
-       }
-
-       return dev_inst;
-}
-
-static uint32_t aqua_vanjaram_logical_to_dev_mask(struct amdgpu_device *adev,
-                                        enum amd_hw_ip_block_type block,
-                                        uint32_t mask)
-{
-       uint32_t dev_mask = 0;
-       int8_t log_inst, dev_inst;
-
-       while (mask) {
-               log_inst = ffs(mask) - 1;
-               dev_inst = aqua_vanjaram_logical_to_dev_inst(adev, block, log_inst);
-               dev_mask |= (1 << dev_inst);
-               mask &= ~(1 << log_inst);
-       }
-
-       return dev_mask;
-}
-
-static void aqua_vanjaram_populate_ip_map(struct amdgpu_device *adev,
-                                         enum amd_hw_ip_block_type ip_block,
-                                         uint32_t inst_mask)
-{
-       int l = 0, i;
-
-       while (inst_mask) {
-               i = ffs(inst_mask) - 1;
-               adev->ip_map.dev_inst[ip_block][l++] = i;
-               inst_mask &= ~(1 << i);
-       }
-       for (; l < HWIP_MAX_INSTANCE; l++)
-               adev->ip_map.dev_inst[ip_block][l] = -1;
-}
-
-void aqua_vanjaram_ip_map_init(struct amdgpu_device *adev) -{
-       u32 ip_map[][2] = {
-               { GC_HWIP, adev->gfx.xcc_mask },
-               { SDMA0_HWIP, adev->sdma.sdma_mask },
-               { VCN_HWIP, adev->vcn.inst_mask },
-       };
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(ip_map); ++i)
-               aqua_vanjaram_populate_ip_map(adev, ip_map[i][0], ip_map[i][1]);
-
-       adev->ip_map.logical_to_dev_inst = aqua_vanjaram_logical_to_dev_inst;
-       adev->ip_map.logical_to_dev_mask = aqua_vanjaram_logical_to_dev_mask;
-}
-
 /* Fixed pattern for smn addressing on different AIDs:
  *   bit[34]: indicate cross AID access
  *   bit[33:32]: indicate target AID id
@@ -839,7 +769,7 @@ int aqua_vanjaram_init_soc_config(struct amdgpu_device *adev)
        if (ret)
                return ret;

-       aqua_vanjaram_ip_map_init(adev);
+       amdgpu_ip_map_init(adev);

        return 0;
 }
diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.h b/drivers/gpu/drm/amd/amdgpu/soc15.h
index ef7c603b50ae..c8ac11a9cdef 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15.h
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.h
@@ -118,7 +118,6 @@ int vega10_reg_base_init(struct amdgpu_device *adev);  int vega20_reg_base_init(struct amdgpu_device *adev);  int arct_reg_base_init(struct amdgpu_device *adev);  int aldebaran_reg_base_init(struct amdgpu_device *adev); -void aqua_vanjaram_ip_map_init(struct amdgpu_device *adev);
 u64 aqua_vanjaram_encode_ext_smn_addressing(int ext_id);  int aqua_vanjaram_init_soc_config(struct amdgpu_device *adev);  ssize_t aqua_vanjaram_get_reg_state(struct amdgpu_device *adev,
--
2.34.1