drm/amdgpu: update parameter of ras_ih_cb

change struct ras_err_data *err_data to void *err_data, align with
umc code and the callback's declaration in each ras block could
pay no attention to the structure type

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_ras.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
index ae386c466c0e438758594bbfa5d3a576f9f235f0..f80fd3428c98ea449e8b907a8eec40366dd66fbd 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
@@ -362,7 +362,7 @@ struct ras_err_handler_data {
 };
 
 typedef int (*ras_ih_cb)(struct amdgpu_device *adev,
-               struct ras_err_data *err_data,
+               void *err_data,
                struct amdgpu_iv_entry *entry);
 
 struct ras_ih_data {

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index 5365b30dfaeab856639f3cc2dab327be3bdd610d..bced3130c240eda304a1ebfc57a5f3384acccc08 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -4204,7 +4204,7 @@ static int gfx_v9_0_early_init(void *handle)
 }
 
 static int gfx_v9_0_process_ras_data_cb(struct amdgpu_device *adev,
-               struct ras_err_data *err_data,
+               void *err_data,
                struct amdgpu_iv_entry *entry);
 
 static int gfx_v9_0_ecc_late_init(void *handle)
@@ -5457,7 +5457,7 @@ static int gfx_v9_0_priv_inst_irq(struct amdgpu_device *adev,
 }
 
 static int gfx_v9_0_process_ras_data_cb(struct amdgpu_device *adev,
-               struct ras_err_data *err_data,
+               void *err_data,
                struct amdgpu_iv_entry *entry)
 {
        /* TODO ue will trigger an interrupt. */

diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
index 7f6536c5e549fc3a87e9042283f5f11a2e5347d9..8910a18547b067d59aa350e0e051b47e8f6d8732 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
@@ -246,16 +246,18 @@ static int gmc_v9_0_ecc_interrupt_state(struct amdgpu_device *adev,
 }
 
 static int gmc_v9_0_process_ras_data_cb(struct amdgpu_device *adev,
-               struct ras_err_data *err_data,
+               void *ras_error_status,
                struct amdgpu_iv_entry *entry)
 {
+       struct ras_err_data *err_data = (struct ras_err_data *)ras_error_status;
+
        if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__GFX))
                return AMDGPU_RAS_SUCCESS;
 
        kgd2kfd_set_sram_ecc_flag(adev->kfd.dev);
        if (adev->umc.funcs &&
            adev->umc.funcs->query_ras_error_count)
-           adev->umc.funcs->query_ras_error_count(adev, err_data);
+           adev->umc.funcs->query_ras_error_count(adev, ras_error_status);
 
        if (adev->umc.funcs &&
            adev->umc.funcs->query_ras_error_address &&

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
index 265b9c01a7635c508af66f6d49bb4bca53528ecf..ae098e2d5dcbade1f945f11ecc3607e23b2c29e8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
@@ -1690,7 +1690,7 @@ static int sdma_v4_0_early_init(void *handle)
 }
 
 static int sdma_v4_0_process_ras_data_cb(struct amdgpu_device *adev,
-               struct ras_err_data *err_data,
+               void *err_data,
                struct amdgpu_iv_entry *entry);
 
 static int sdma_v4_0_late_init(void *handle)
@@ -1939,7 +1939,7 @@ static int sdma_v4_0_process_trap_irq(struct amdgpu_device *adev,
 }
 
 static int sdma_v4_0_process_ras_data_cb(struct amdgpu_device *adev,
-               struct ras_err_data *err_data,
+               void *err_data,
                struct amdgpu_iv_entry *entry)
 {
        uint32_t err_source;