drm/amdgpu: drop useless BACO arg in amdgpu_ras_reset_gpu

BACO reset mode strategy is determined by latter func when
calling amdgpu_ras_reset_gpu. So not to confuse audience, drop
it.

Signed-off-by: Guchun Chen <guchun.chen@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@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 e00b46180d2ecdfb8ab38ce415fd0dcf53bd001d..db7b2b3f9966198bdcdc2a7fe247bfee43ad2af8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
@@ -641,7 +641,7 @@ int amdgpu_gfx_process_ras_data_cb(struct amdgpu_device *adev,
                kgd2kfd_set_sram_ecc_flag(adev->kfd.dev);
                if (adev->gfx.funcs->query_ras_error_count)
                        adev->gfx.funcs->query_ras_error_count(adev, err_data);
-               amdgpu_ras_reset_gpu(adev, 0);
+               amdgpu_ras_reset_gpu(adev);
        }
        return AMDGPU_RAS_SUCCESS;
 }

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index 04394c45aa031211da38f4688d42a1666d6bc64a..d5346dc2523ac3b1a76b3458413d141133dfb88b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -1870,7 +1870,7 @@ void amdgpu_ras_resume(struct amdgpu_device *adev)
                 * See feature_enable_on_boot
                 */
                amdgpu_ras_disable_all_features(adev, 1);
-               amdgpu_ras_reset_gpu(adev, 0);
+               amdgpu_ras_reset_gpu(adev);
        }
 }
 
@@ -1933,6 +1933,6 @@ void amdgpu_ras_global_ras_isr(struct amdgpu_device *adev)
        if (atomic_cmpxchg(&amdgpu_ras_in_intr, 0, 1) == 0) {
                DRM_WARN("RAS event of type ERREVENT_ATHUB_INTERRUPT detected!\n");
 
-               amdgpu_ras_reset_gpu(adev, false);
+               amdgpu_ras_reset_gpu(adev);
        }
 }

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
index d4ade47392455e5810688198e9a6d35711c1f622..a5fe29a9373eab17ad61d77eab525e8c7946e0be 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
@@ -494,8 +494,7 @@ int amdgpu_ras_add_bad_pages(struct amdgpu_device *adev,
 
 int amdgpu_ras_reserve_bad_pages(struct amdgpu_device *adev);
 
-static inline int amdgpu_ras_reset_gpu(struct amdgpu_device *adev,
-               bool is_baco)
+static inline int amdgpu_ras_reset_gpu(struct amdgpu_device *adev)
 {
        struct amdgpu_ras *ras = amdgpu_ras_get_context(adev);
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c
index 6010999d90208321378e660c35ce5ab6b9c7af13..a2ee30b16212811648f52e818e26af77f748d14f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c
@@ -160,7 +160,7 @@ int amdgpu_sdma_process_ras_data_cb(struct amdgpu_device *adev,
                struct amdgpu_iv_entry *entry)
 {
        kgd2kfd_set_sram_ecc_flag(adev->kfd.dev);
-       amdgpu_ras_reset_gpu(adev, 0);
+       amdgpu_ras_reset_gpu(adev);
 
        return AMDGPU_RAS_SUCCESS;
 }

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c
index d4fb9cf27e2120dcab060fa633f272149e06f164..8a6c733d170c598501f8b1ceb175951072f32335 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c
@@ -132,7 +132,7 @@ int amdgpu_umc_process_ras_data_cb(struct amdgpu_device *adev,
                                                err_data->err_addr_cnt))
                        DRM_WARN("Failed to add ras bad page!\n");
 
-               amdgpu_ras_reset_gpu(adev, 0);
+               amdgpu_ras_reset_gpu(adev);
        }
 
        kfree(err_data->err_addr);

diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
index bb701dbfd472957b3763b3a3d9c44acd146db6b2..7091782266b987003eca8ed095808df6bd17614e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
@@ -339,7 +339,7 @@ static void nbio_v7_4_handle_ras_controller_intr_no_bifring(struct amdgpu_device
                /* ras_controller_int is dedicated for nbif ras error,
                 * not the global interrupt for sync flood
                 */
-               amdgpu_ras_reset_gpu(adev, true);
+               amdgpu_ras_reset_gpu(adev);
        }
 }