drm/amdgpu: remove mmhub ip

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

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 85dc464..383a943 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1862,7 +1862,6 @@ static int amdgpu_sriov_reinit_early(struct amdgpu_device *adev)
        static enum amd_ip_block_type ip_order[] = {
                AMD_IP_BLOCK_TYPE_GMC,
                AMD_IP_BLOCK_TYPE_COMMON,
-               AMD_IP_BLOCK_TYPE_MMHUB,
                AMD_IP_BLOCK_TYPE_IH,
        };
 

diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
index d95380e..8995dad 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
@@ -371,61 +371,6 @@ void mmhub_v1_0_init(struct amdgpu_device *adev)
 
 }
 
-static int mmhub_v1_0_early_init(void *handle)
-{
-       return 0;
-}
-
-static int mmhub_v1_0_late_init(void *handle)
-{
-       return 0;
-}
-
-static int mmhub_v1_0_sw_init(void *handle)
-{
-       return 0;
-}
-
-static int mmhub_v1_0_sw_fini(void *handle)
-{
-       return 0;
-}
-
-static int mmhub_v1_0_hw_init(void *handle)
-{
-       return 0;
-}
-
-static int mmhub_v1_0_hw_fini(void *handle)
-{
-       return 0;
-}
-
-static int mmhub_v1_0_suspend(void *handle)
-{
-       return 0;
-}
-
-static int mmhub_v1_0_resume(void *handle)
-{
-       return 0;
-}
-
-static bool mmhub_v1_0_is_idle(void *handle)
-{
-       return true;
-}
-
-static int mmhub_v1_0_wait_for_idle(void *handle)
-{
-       return 0;
-}
-
-static int mmhub_v1_0_soft_reset(void *handle)
-{
-       return 0;
-}
-
 static void mmhub_v1_0_update_medium_grain_clock_gating(struct amdgpu_device *adev,
                                                        bool enable)
 {
@@ -563,12 +508,6 @@ int mmhub_v1_0_set_clockgating(struct amdgpu_device *adev,
        return 0;
 }
 
-static int mmhub_v1_0_set_clockgating_state(void *handle,
-                                           enum amd_clockgating_state state)
-{
-       return 0;
-}
-
 void mmhub_v1_0_get_clockgating(struct amdgpu_device *adev, u32 *flags)
 {
        int data;
@@ -586,35 +525,3 @@ void mmhub_v1_0_get_clockgating(struct amdgpu_device *adev, u32 *flags)
        if (data & ATC_L2_MISC_CG__MEM_LS_ENABLE_MASK)
                *flags |= AMD_CG_SUPPORT_MC_LS;
 }
-
-static int mmhub_v1_0_set_powergating_state(void *handle,
-                                       enum amd_powergating_state state)
-{
-       return 0;
-}
-
-const struct amd_ip_funcs mmhub_v1_0_ip_funcs = {
-       .name = "mmhub_v1_0",
-       .early_init = mmhub_v1_0_early_init,
-       .late_init = mmhub_v1_0_late_init,
-       .sw_init = mmhub_v1_0_sw_init,
-       .sw_fini = mmhub_v1_0_sw_fini,
-       .hw_init = mmhub_v1_0_hw_init,
-       .hw_fini = mmhub_v1_0_hw_fini,
-       .suspend = mmhub_v1_0_suspend,
-       .resume = mmhub_v1_0_resume,
-       .is_idle = mmhub_v1_0_is_idle,
-       .wait_for_idle = mmhub_v1_0_wait_for_idle,
-       .soft_reset = mmhub_v1_0_soft_reset,
-       .set_clockgating_state = mmhub_v1_0_set_clockgating_state,
-       .set_powergating_state = mmhub_v1_0_set_powergating_state,
-};
-
-const struct amdgpu_ip_block_version mmhub_v1_0_ip_block =
-{
-       .type = AMD_IP_BLOCK_TYPE_MMHUB,
-       .major = 1,
-       .minor = 0,
-       .rev = 0,
-       .funcs = &mmhub_v1_0_ip_funcs,
-};

diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index baaa160..22b222b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -484,7 +484,6 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
        switch (adev->asic_type) {
        case CHIP_VEGA10:
                amdgpu_ip_block_add(adev, &vega10_common_ip_block);
-               amdgpu_ip_block_add(adev, &mmhub_v1_0_ip_block);
                amdgpu_ip_block_add(adev, &gmc_v9_0_ip_block);
                amdgpu_ip_block_add(adev, &vega10_ih_ip_block);
                if (amdgpu_fw_load_type == 2 || amdgpu_fw_load_type == -1)
@@ -500,7 +499,6 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
                break;
        case CHIP_RAVEN:
                amdgpu_ip_block_add(adev, &vega10_common_ip_block);
-               amdgpu_ip_block_add(adev, &mmhub_v1_0_ip_block);
                amdgpu_ip_block_add(adev, &gmc_v9_0_ip_block);
                amdgpu_ip_block_add(adev, &vega10_ih_ip_block);
                amdgpu_ip_block_add(adev, &psp_v10_0_ip_block);

diff --git a/drivers/gpu/drm/amd/include/amd_shared.h b/drivers/gpu/drm/amd/include/amd_shared.h
index 0699031..beb2a81 100644 (file)
--- a/drivers/gpu/drm/amd/include/amd_shared.h
+++ b/drivers/gpu/drm/amd/include/amd_shared.h
@@ -76,7 +76,6 @@ enum amd_ip_block_type {
        AMD_IP_BLOCK_TYPE_UVD,
        AMD_IP_BLOCK_TYPE_VCE,
        AMD_IP_BLOCK_TYPE_ACP,
-       AMD_IP_BLOCK_TYPE_MMHUB,
        AMD_IP_BLOCK_TYPE_VCN
 };