drm/amdgpu: replace mmhub_funcs with mmhub.funcs

remove mmhub_funcs in adev

Signed-off-by: Tao Zhou <tao.zhou1@amd.com>
Reviewed-by: Guchun Chen <guchun.chen@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index b29d4a34812eefb4fc014c2cc9ac523ee9a71974..578cd81814a0c559f25fa5a7195ff4a78cd036ed 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -925,7 +925,6 @@ struct amdgpu_device {
        uint32_t                *reg_offset[MAX_HWIP][HWIP_MAX_INSTANCE];
 
        const struct amdgpu_df_funcs    *df_funcs;
-       const struct amdgpu_mmhub_funcs *mmhub_funcs;
 
        /* delayed work_func for deferring clockgating during resume */
        struct delayed_work     delayed_init_work;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index 14f3f8d831d83e0d6c0280878a66af460b113821..00cd01c616682335c670f593231af72c3983b0fe 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -687,8 +687,8 @@ int amdgpu_ras_error_query(struct amdgpu_device *adev,
                        adev->gfx.funcs->query_ras_error_count(adev, &err_data);
                break;
        case AMDGPU_RAS_BLOCK__MMHUB:
-               if (adev->mmhub_funcs->query_ras_error_count)
-                       adev->mmhub_funcs->query_ras_error_count(adev, &err_data);
+               if (adev->mmhub.funcs->query_ras_error_count)
+                       adev->mmhub.funcs->query_ras_error_count(adev, &err_data);
                break;
        case AMDGPU_RAS_BLOCK__PCIE_BIF:
                if (adev->nbio.funcs->query_ras_error_count)

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 40dad08ed1fa4e3545b7c04fc34ac4a0d2bdbbc3..b7cc512941ced6191e9613aa52f9194da3509d50 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -655,7 +655,7 @@ static void gmc_v9_0_set_mmhub_funcs(struct amdgpu_device *adev)
 {
        switch (adev->asic_type) {
        case CHIP_VEGA20:
-               adev->mmhub_funcs = &mmhub_v1_0_funcs;
+               adev->mmhub.funcs = &mmhub_v1_0_funcs;
                break;
        default:
                break;
@@ -750,8 +750,8 @@ static int gmc_v9_0_ecc_late_init(void *handle)
                        return r;
        }
 
-       if (adev->mmhub_funcs && adev->mmhub_funcs->ras_late_init) {
-               r = adev->mmhub_funcs->ras_late_init(adev);
+       if (adev->mmhub.funcs && adev->mmhub.funcs->ras_late_init) {
+               r = adev->mmhub.funcs->ras_late_init(adev);
                if (r)
                        return r;
        }