drm/amdgpu: move mmhub ras fini to mmhub block

it's more suitable to put mmhub ras fini in mmhub block

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.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
index 32687f4c21dc36f4f3a996005b215063127c274e..9b4c051e540d3de899263438e1edc28811865a56 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
@@ -310,17 +310,7 @@ bool amdgpu_gmc_filter_faults(struct amdgpu_device *adev, uint64_t addr,
 void amdgpu_gmc_ras_fini(struct amdgpu_device *adev)
 {
        amdgpu_umc_ras_fini(adev);
-
-       if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__MMHUB) &&
-                       adev->mmhub.ras_if) {
-               struct ras_common_if *ras_if = adev->mmhub.ras_if;
-               struct ras_ih_if ih_info = {
-                       .cb = NULL,
-               };
-
-               amdgpu_ras_late_fini(adev, ras_if, &ih_info);
-               kfree(ras_if);
-       }
+       amdgpu_mmhub_ras_fini(adev);
 
        if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__XGMI_WAFL) &&
                        adev->gmc.xgmi.ras_if) {

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c
index fe1709ee8f4b66c8766be85fc70e1cdac3e1875c..676c48c02d771cddd0ff018d6381ee535c5006ce 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c
@@ -54,3 +54,17 @@ int amdgpu_mmhub_ras_late_init(struct amdgpu_device *adev)
 
        return r;
 }
+
+void amdgpu_mmhub_ras_fini(struct amdgpu_device *adev)
+{
+       if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__MMHUB) &&
+                       adev->mmhub.ras_if) {
+               struct ras_common_if *ras_if = adev->mmhub.ras_if;
+               struct ras_ih_if ih_info = {
+                       .cb = NULL,
+               };
+
+               amdgpu_ras_late_fini(adev, ras_if, &ih_info);
+               kfree(ras_if);
+       }
+}

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h
index a733898c7d553a368c2987d9afa36ae70e964bf7..1cd78940cf828b88a1a49b8de8ecfffae88b5ae5 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h
@@ -34,6 +34,6 @@ struct amdgpu_mmhub {
 };
 
 int amdgpu_mmhub_ras_late_init(struct amdgpu_device *adev);
-
+void amdgpu_mmhub_ras_fini(struct amdgpu_device *adev);
 #endif