drm/amdgpu: Optimize xxx_ras_fini function of each ras block

1. Move the variables of ras block instance members from
   specific xxx_ras_fini to general ras_fini call.
2. Function calls inside the modules only use parameters
   passed from xxx_ras_fini instead of ras block instance
   members.

Signed-off-by: yipechai <YiPeng.Chai@amd.com>
Reviewed-by: Tao Zhou <tao.zhou1@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
index d020c459943337630b827cecff9c099723c0c877..40f7e29aa9ca374abc1bf4ee42190cb16e3376d9 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
@@ -647,8 +647,8 @@ late_fini:
 void amdgpu_gfx_ras_fini(struct amdgpu_device *adev, struct ras_common_if *ras_block)
 {
        if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__GFX) &&
-                       adev->gfx.ras_if)
-               amdgpu_ras_block_late_fini(adev, adev->gfx.ras_if);
+                       ras_block)
+               amdgpu_ras_block_late_fini(adev, ras_block);
 }
 
 int amdgpu_gfx_process_ras_data_cb(struct amdgpu_device *adev,

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
index 350fbfec1e037b54cdf49402be147815d5f81c29..62083d3aa9b80efa0985d30e4fc946f93c2536af 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c
@@ -455,16 +455,16 @@ int amdgpu_gmc_ras_late_init(struct amdgpu_device *adev)
 void amdgpu_gmc_ras_fini(struct amdgpu_device *adev)
 {
        if (adev->umc.ras && adev->umc.ras->ras_block.ras_fini)
-               adev->umc.ras->ras_block.ras_fini(adev, NULL);
+               adev->umc.ras->ras_block.ras_fini(adev, adev->umc.ras_if);
 
        if (adev->mmhub.ras && adev->mmhub.ras->ras_block.ras_fini)
-               adev->mmhub.ras->ras_block.ras_fini(adev, NULL);
+               adev->mmhub.ras->ras_block.ras_fini(adev, adev->mmhub.ras_if);
 
        if (adev->gmc.xgmi.ras && adev->gmc.xgmi.ras->ras_block.ras_fini)
-               adev->gmc.xgmi.ras->ras_block.ras_fini(adev, NULL);
+               adev->gmc.xgmi.ras->ras_block.ras_fini(adev, adev->gmc.xgmi.ras_if);
 
        if (adev->hdp.ras && adev->hdp.ras->ras_block.ras_fini)
-               adev->hdp.ras->ras_block.ras_fini(adev, NULL);
+               adev->hdp.ras->ras_block.ras_fini(adev, adev->hdp.ras_if);
 }
 
        /*

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c
index 0f224e21cd5556603201669d8d64e9172ace4f6b..5595f903c17a021456d1b48ff69dff236a44b76a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c
@@ -27,6 +27,6 @@
 void amdgpu_hdp_ras_fini(struct amdgpu_device *adev, struct ras_common_if *ras_block)
 {
        if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__HDP) &&
-           adev->hdp.ras_if)
-               amdgpu_ras_block_late_fini(adev, adev->hdp.ras_if);
+           ras_block)
+               amdgpu_ras_block_late_fini(adev, ras_block);
 }

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c
index 6dfcedcc37fd3816a6bf7321415af489f69b9210..e7c3b8fff86814642ef3b913b56df276ce984a68 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c
@@ -27,6 +27,6 @@
 void amdgpu_mmhub_ras_fini(struct amdgpu_device *adev, struct ras_common_if *ras_block)
 {
        if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__MMHUB) &&
-                       adev->mmhub.ras_if)
-               amdgpu_ras_block_late_fini(adev, adev->mmhub.ras_if);
+                       ras_block)
+               amdgpu_ras_block_late_fini(adev, ras_block);
 }

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c
index 0de2fdf31eed7918f402350d0f04846b5dbd7991..54a5a15272c1e74cc4e7fe3e8c15405419a7ae56 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c
@@ -47,6 +47,6 @@ late_fini:
 void amdgpu_nbio_ras_fini(struct amdgpu_device *adev, struct ras_common_if *ras_block)
 {
        if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__PCIE_BIF) &&
-                       adev->nbio.ras_if)
-               amdgpu_ras_block_late_fini(adev, adev->nbio.ras_if);
+                       ras_block)
+               amdgpu_ras_block_late_fini(adev, ras_block);
 }

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c
index 863035a94bd86e1ca738ee8b37a05e486ecbef01..1df8de84386d7389048da1549620198b0e423233 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c
@@ -114,8 +114,8 @@ late_fini:
 void amdgpu_sdma_ras_fini(struct amdgpu_device *adev, struct ras_common_if *ras_block)
 {
        if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__SDMA) &&
-                       adev->sdma.ras_if)
-               amdgpu_ras_block_late_fini(adev, adev->sdma.ras_if);
+                       ras_block)
+               amdgpu_ras_block_late_fini(adev, ras_block);
 }
 
 int amdgpu_sdma_process_ras_data_cb(struct amdgpu_device *adev,

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c
index 41e976733c57627731e99dab567838f4c47c8796..2623a2d30703b3510aacb366eb86d8a8635110e1 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c
@@ -165,8 +165,8 @@ late_fini:
 void amdgpu_umc_ras_fini(struct amdgpu_device *adev, struct ras_common_if *ras_block)
 {
        if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__UMC) &&
-                       adev->umc.ras_if)
-               amdgpu_ras_block_late_fini(adev, adev->umc.ras_if);
+                       ras_block)
+               amdgpu_ras_block_late_fini(adev, ras_block);
 }
 
 int amdgpu_umc_process_ecc_irq(struct amdgpu_device *adev,

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
index 3e56adea84a359208d62c70b1ba78557a064cc6e..a54257760f9eed09bf6146a49a9cb69cf886b069 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
@@ -771,8 +771,8 @@ static int amdgpu_xgmi_ras_late_init(struct amdgpu_device *adev, struct ras_comm
 static void amdgpu_xgmi_ras_fini(struct amdgpu_device *adev, struct ras_common_if *ras_block)
 {
        if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__XGMI_WAFL) &&
-                       adev->gmc.xgmi.ras_if)
-               amdgpu_ras_block_late_fini(adev, adev->gmc.xgmi.ras_if);
+                       ras_block)
+               amdgpu_ras_block_late_fini(adev, ras_block);
 }
 
 uint64_t amdgpu_xgmi_get_relative_phy_addr(struct amdgpu_device *adev,

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index 3ecb238c64831d3b6f5aa80c3c5df1863b892141..e8446967a4d46c88485d4140825124b39eb7df6d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -2433,7 +2433,7 @@ static int gfx_v9_0_sw_fini(void *handle)
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
        if (adev->gfx.ras && adev->gfx.ras->ras_block.ras_fini)
-               adev->gfx.ras->ras_block.ras_fini(adev, NULL);
+               adev->gfx.ras->ras_block.ras_fini(adev, adev->gfx.ras_if);
 
        for (i = 0; i < adev->gfx.num_gfx_rings; i++)
                amdgpu_ring_fini(&adev->gfx.gfx_ring[i]);

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
index d0a9012e53d7c301982f7bdf88a41ef54dbe4c7f..222d25a0413a92c49ce145a79f0ef509c88f473c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
@@ -1997,7 +1997,7 @@ static int sdma_v4_0_sw_fini(void *handle)
 
        if (adev->sdma.ras && adev->sdma.ras->ras_block.hw_ops &&
                adev->sdma.ras->ras_block.ras_fini)
-               adev->sdma.ras->ras_block.ras_fini(adev, NULL);
+               adev->sdma.ras->ras_block.ras_fini(adev, adev->sdma.ras_if);
 
        for (i = 0; i < adev->sdma.num_instances; i++) {
                amdgpu_ring_fini(&adev->sdma.instance[i].ring);

diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 34cd5cad7da5a1a1b35fdaec3b41874dcf0a15df..0631ebd39db18c4c0004e83781ed0024221a2692 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -1215,7 +1215,7 @@ static int soc15_common_sw_fini(void *handle)
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
        if (adev->nbio.ras && adev->nbio.ras->ras_block.ras_fini)
-               adev->nbio.ras->ras_block.ras_fini(adev, NULL);
+               adev->nbio.ras->ras_block.ras_fini(adev, adev->nbio.ras_if);
 
        if (adev->df.funcs &&
            adev->df.funcs->sw_fini)