drm/amdgpu: move mmhub_ras_if from gmc to mmhub block

mmhub_ras_if is relevant to mmhub

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_gmc.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
index 524df154a5aef66cd9db25ccb4664676d135b60d..cbc80c5da3f9ccc0506a453165fbfb65714ce8de 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h
@@ -181,7 +181,6 @@ struct amdgpu_gmc {
 
        struct amdgpu_xgmi xgmi;
        struct amdgpu_irq_src   ecc_irq;
-       struct ras_common_if    *mmhub_ras_if;
 };
 
 #define amdgpu_gmc_flush_gpu_tlb(adev, vmid, vmhub, type) ((adev)->gmc.gmc_funcs->flush_gpu_tlb((adev), (vmid), (vmhub), (type)))

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c
index 99ef6b1f8526f901db89fdedfd7dcd7042fd923c..fe1709ee8f4b66c8766be85fc70e1cdac3e1875c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c
@@ -35,21 +35,21 @@ int amdgpu_mmhub_ras_late_init(struct amdgpu_device *adev)
                .debugfs_name = "mmhub_err_inject",
        };
 
-       if (!adev->gmc.mmhub_ras_if) {
-               adev->gmc.mmhub_ras_if = kmalloc(sizeof(struct ras_common_if), GFP_KERNEL);
-               if (!adev->gmc.mmhub_ras_if)
+       if (!adev->mmhub.ras_if) {
+               adev->mmhub.ras_if = kmalloc(sizeof(struct ras_common_if), GFP_KERNEL);
+               if (!adev->mmhub.ras_if)
                        return -ENOMEM;
-               adev->gmc.mmhub_ras_if->block = AMDGPU_RAS_BLOCK__MMHUB;
-               adev->gmc.mmhub_ras_if->type = AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE;
-               adev->gmc.mmhub_ras_if->sub_block_index = 0;
-               strcpy(adev->gmc.mmhub_ras_if->name, "mmhub");
+               adev->mmhub.ras_if->block = AMDGPU_RAS_BLOCK__MMHUB;
+               adev->mmhub.ras_if->type = AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE;
+               adev->mmhub.ras_if->sub_block_index = 0;
+               strcpy(adev->mmhub.ras_if->name, "mmhub");
        }
-       ih_info.head = fs_info.head = *adev->gmc.mmhub_ras_if;
-       r = amdgpu_ras_late_init(adev, adev->gmc.mmhub_ras_if,
+       ih_info.head = fs_info.head = *adev->mmhub.ras_if;
+       r = amdgpu_ras_late_init(adev, adev->mmhub.ras_if,
                                 &fs_info, &ih_info);
-       if (r || !amdgpu_ras_is_supported(adev, adev->gmc.mmhub_ras_if->block)) {
-               kfree(adev->gmc.mmhub_ras_if);
-               adev->gmc.mmhub_ras_if = NULL;
+       if (r || !amdgpu_ras_is_supported(adev, adev->mmhub.ras_if->block)) {
+               kfree(adev->mmhub.ras_if);
+               adev->mmhub.ras_if = NULL;
        }
 
        return r;

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index b7cc512941ced6191e9613aa52f9194da3509d50..0d89cb5d3503d7be8cd6ffe86323c84ddea48672 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -1125,8 +1125,8 @@ static int gmc_v9_0_sw_fini(void *handle)
        }
 
        if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__MMHUB) &&
-                       adev->gmc.mmhub_ras_if) {
-               struct ras_common_if *ras_if = adev->gmc.mmhub_ras_if;
+                       adev->mmhub.ras_if) {
+               struct ras_common_if *ras_if = adev->mmhub.ras_if;
 
                /* remove fs and disable ras feature */
                amdgpu_ras_debugfs_remove(adev, ras_if);