Commit 4e9b1fa5 authored by yipechai's avatar yipechai Committed by Alex Deucher

drm/amdgpu: Modify .ras_late_init function pointer parameter

Modify .ras_late_init function pointer parameter so that
it can remove redundant intermediate calls in some ras blocks.
Signed-off-by: default avataryipechai <YiPeng.Chai@amd.com>
Reviewed-by: default avatarTao Zhou <tao.zhou1@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f83e1401
...@@ -622,7 +622,7 @@ int amdgpu_get_gfx_off_status(struct amdgpu_device *adev, uint32_t *value) ...@@ -622,7 +622,7 @@ int amdgpu_get_gfx_off_status(struct amdgpu_device *adev, uint32_t *value)
return r; return r;
} }
int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev, void *ras_info) int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block)
{ {
int r; int r;
r = amdgpu_ras_block_late_init(adev, adev->gfx.ras_if); r = amdgpu_ras_block_late_init(adev, adev->gfx.ras_if);
......
...@@ -386,7 +386,7 @@ bool amdgpu_gfx_is_me_queue_enabled(struct amdgpu_device *adev, int me, ...@@ -386,7 +386,7 @@ bool amdgpu_gfx_is_me_queue_enabled(struct amdgpu_device *adev, int me,
int pipe, int queue); int pipe, int queue);
void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable); void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable);
int amdgpu_get_gfx_off_status(struct amdgpu_device *adev, uint32_t *value); int amdgpu_get_gfx_off_status(struct amdgpu_device *adev, uint32_t *value);
int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev, void *ras_info); int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block);
void amdgpu_gfx_ras_fini(struct amdgpu_device *adev); void amdgpu_gfx_ras_fini(struct amdgpu_device *adev);
int amdgpu_gfx_process_ras_data_cb(struct amdgpu_device *adev, int amdgpu_gfx_process_ras_data_cb(struct amdgpu_device *adev,
void *err_data, void *err_data,
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "amdgpu.h" #include "amdgpu.h"
#include "amdgpu_ras.h" #include "amdgpu_ras.h"
int amdgpu_hdp_ras_late_init(struct amdgpu_device *adev, void *ras_info) int amdgpu_hdp_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block)
{ {
return amdgpu_ras_block_late_init(adev, adev->hdp.ras_if); return amdgpu_ras_block_late_init(adev, adev->hdp.ras_if);
} }
......
...@@ -43,6 +43,6 @@ struct amdgpu_hdp { ...@@ -43,6 +43,6 @@ struct amdgpu_hdp {
struct amdgpu_hdp_ras *ras; struct amdgpu_hdp_ras *ras;
}; };
int amdgpu_hdp_ras_late_init(struct amdgpu_device *adev, void *ras_info); int amdgpu_hdp_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block);
void amdgpu_hdp_ras_fini(struct amdgpu_device *adev); void amdgpu_hdp_ras_fini(struct amdgpu_device *adev);
#endif /* __AMDGPU_HDP_H__ */ #endif /* __AMDGPU_HDP_H__ */
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "amdgpu.h" #include "amdgpu.h"
#include "amdgpu_ras.h" #include "amdgpu_ras.h"
int amdgpu_mmhub_ras_late_init(struct amdgpu_device *adev, void *ras_info) int amdgpu_mmhub_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block)
{ {
return amdgpu_ras_block_late_init(adev, adev->mmhub.ras_if); return amdgpu_ras_block_late_init(adev, adev->mmhub.ras_if);
} }
......
...@@ -47,7 +47,7 @@ struct amdgpu_mmhub { ...@@ -47,7 +47,7 @@ struct amdgpu_mmhub {
struct amdgpu_mmhub_ras *ras; struct amdgpu_mmhub_ras *ras;
}; };
int amdgpu_mmhub_ras_late_init(struct amdgpu_device *adev, void *ras_info); int amdgpu_mmhub_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block);
void amdgpu_mmhub_ras_fini(struct amdgpu_device *adev); void amdgpu_mmhub_ras_fini(struct amdgpu_device *adev);
#endif #endif
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "amdgpu.h" #include "amdgpu.h"
#include "amdgpu_ras.h" #include "amdgpu_ras.h"
int amdgpu_nbio_ras_late_init(struct amdgpu_device *adev, void *ras_info) int amdgpu_nbio_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block)
{ {
int r; int r;
r = amdgpu_ras_block_late_init(adev, adev->nbio.ras_if); r = amdgpu_ras_block_late_init(adev, adev->nbio.ras_if);
......
...@@ -104,6 +104,6 @@ struct amdgpu_nbio { ...@@ -104,6 +104,6 @@ struct amdgpu_nbio {
struct amdgpu_nbio_ras *ras; struct amdgpu_nbio_ras *ras;
}; };
int amdgpu_nbio_ras_late_init(struct amdgpu_device *adev, void *ras_info); int amdgpu_nbio_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block);
void amdgpu_nbio_ras_fini(struct amdgpu_device *adev); void amdgpu_nbio_ras_fini(struct amdgpu_device *adev);
#endif #endif
...@@ -490,7 +490,7 @@ struct amdgpu_ras_block_object { ...@@ -490,7 +490,7 @@ struct amdgpu_ras_block_object {
int (*ras_block_match)(struct amdgpu_ras_block_object *block_obj, int (*ras_block_match)(struct amdgpu_ras_block_object *block_obj,
enum amdgpu_ras_block block, uint32_t sub_block_index); enum amdgpu_ras_block block, uint32_t sub_block_index);
int (*ras_late_init)(struct amdgpu_device *adev, void *ras_info); int (*ras_late_init)(struct amdgpu_device *adev, struct ras_common_if *ras_block);
void (*ras_fini)(struct amdgpu_device *adev); void (*ras_fini)(struct amdgpu_device *adev);
ras_ih_cb ras_cb; ras_ih_cb ras_cb;
const struct amdgpu_ras_block_hw_ops *hw_ops; const struct amdgpu_ras_block_hw_ops *hw_ops;
......
...@@ -87,7 +87,7 @@ uint64_t amdgpu_sdma_get_csa_mc_addr(struct amdgpu_ring *ring, ...@@ -87,7 +87,7 @@ uint64_t amdgpu_sdma_get_csa_mc_addr(struct amdgpu_ring *ring,
} }
int amdgpu_sdma_ras_late_init(struct amdgpu_device *adev, int amdgpu_sdma_ras_late_init(struct amdgpu_device *adev,
void *ras_ih_info) struct ras_common_if *ras_block)
{ {
int r, i; int r, i;
......
...@@ -117,7 +117,7 @@ amdgpu_sdma_get_instance_from_ring(struct amdgpu_ring *ring); ...@@ -117,7 +117,7 @@ amdgpu_sdma_get_instance_from_ring(struct amdgpu_ring *ring);
int amdgpu_sdma_get_index_from_ring(struct amdgpu_ring *ring, uint32_t *index); int amdgpu_sdma_get_index_from_ring(struct amdgpu_ring *ring, uint32_t *index);
uint64_t amdgpu_sdma_get_csa_mc_addr(struct amdgpu_ring *ring, unsigned vmid); uint64_t amdgpu_sdma_get_csa_mc_addr(struct amdgpu_ring *ring, unsigned vmid);
int amdgpu_sdma_ras_late_init(struct amdgpu_device *adev, int amdgpu_sdma_ras_late_init(struct amdgpu_device *adev,
void *ras_ih_info); struct ras_common_if *ras_block);
void amdgpu_sdma_ras_fini(struct amdgpu_device *adev); void amdgpu_sdma_ras_fini(struct amdgpu_device *adev);
int amdgpu_sdma_process_ras_data_cb(struct amdgpu_device *adev, int amdgpu_sdma_process_ras_data_cb(struct amdgpu_device *adev,
void *err_data, void *err_data,
......
...@@ -136,7 +136,7 @@ int amdgpu_umc_process_ras_data_cb(struct amdgpu_device *adev, ...@@ -136,7 +136,7 @@ int amdgpu_umc_process_ras_data_cb(struct amdgpu_device *adev,
return amdgpu_umc_do_page_retirement(adev, ras_error_status, entry, true); return amdgpu_umc_do_page_retirement(adev, ras_error_status, entry, true);
} }
int amdgpu_umc_ras_late_init(struct amdgpu_device *adev, void *ras_info) int amdgpu_umc_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block)
{ {
int r; int r;
......
...@@ -72,7 +72,7 @@ struct amdgpu_umc { ...@@ -72,7 +72,7 @@ struct amdgpu_umc {
struct amdgpu_umc_ras *ras; struct amdgpu_umc_ras *ras;
}; };
int amdgpu_umc_ras_late_init(struct amdgpu_device *adev, void *ras_info); int amdgpu_umc_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block);
void amdgpu_umc_ras_fini(struct amdgpu_device *adev); void amdgpu_umc_ras_fini(struct amdgpu_device *adev);
int amdgpu_umc_poison_handler(struct amdgpu_device *adev, int amdgpu_umc_poison_handler(struct amdgpu_device *adev,
void *ras_error_status, void *ras_error_status,
......
...@@ -732,7 +732,7 @@ int amdgpu_xgmi_remove_device(struct amdgpu_device *adev) ...@@ -732,7 +732,7 @@ int amdgpu_xgmi_remove_device(struct amdgpu_device *adev)
return psp_xgmi_terminate(&adev->psp); return psp_xgmi_terminate(&adev->psp);
} }
static int amdgpu_xgmi_ras_late_init(struct amdgpu_device *adev, void *ras_info) static int amdgpu_xgmi_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block)
{ {
if (!adev->gmc.xgmi.supported || if (!adev->gmc.xgmi.supported ||
adev->gmc.xgmi.num_physical_nodes == 0) adev->gmc.xgmi.num_physical_nodes == 0)
......
...@@ -37,7 +37,7 @@ static void mca_v3_0_mp0_query_ras_error_count(struct amdgpu_device *adev, ...@@ -37,7 +37,7 @@ static void mca_v3_0_mp0_query_ras_error_count(struct amdgpu_device *adev,
ras_error_status); ras_error_status);
} }
static int mca_v3_0_mp0_ras_late_init(struct amdgpu_device *adev, void *ras_info) static int mca_v3_0_mp0_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block)
{ {
return amdgpu_mca_ras_late_init(adev, &adev->mca.mp0); return amdgpu_mca_ras_late_init(adev, &adev->mca.mp0);
} }
...@@ -89,7 +89,7 @@ static void mca_v3_0_mp1_query_ras_error_count(struct amdgpu_device *adev, ...@@ -89,7 +89,7 @@ static void mca_v3_0_mp1_query_ras_error_count(struct amdgpu_device *adev,
ras_error_status); ras_error_status);
} }
static int mca_v3_0_mp1_ras_late_init(struct amdgpu_device *adev, void *ras_info) static int mca_v3_0_mp1_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block)
{ {
return amdgpu_mca_ras_late_init(adev, &adev->mca.mp1); return amdgpu_mca_ras_late_init(adev, &adev->mca.mp1);
} }
...@@ -127,7 +127,7 @@ static void mca_v3_0_mpio_query_ras_error_count(struct amdgpu_device *adev, ...@@ -127,7 +127,7 @@ static void mca_v3_0_mpio_query_ras_error_count(struct amdgpu_device *adev,
ras_error_status); ras_error_status);
} }
static int mca_v3_0_mpio_ras_late_init(struct amdgpu_device *adev, void *ras_info) static int mca_v3_0_mpio_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block)
{ {
return amdgpu_mca_ras_late_init(adev, &adev->mca.mpio); return amdgpu_mca_ras_late_init(adev, &adev->mca.mpio);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment