We are moving from soc ras to ip ras to address issues as follows - RAS sw block init is mixed in early_init and sw_init - RAS cap check is mixed with both soc check and ip check. RAS cap check is now only avaialble in amdgpu_ras_init, based on the cap query from bios. RAS sw block init is all moved to ras sw_init and follows ip based ras cap check from amdgpu_ras_init, instead of the check in soc level. v2: simplify the ras check (Stanley/Tao) Hawking Zhang (10): drm/amdgpu: Move jpeg ras block init to ras sw_init drm/amdgpu: Move vcn ras block init to ras sw_init drm/amdgpu: Move umc ras block init to gmc ras sw_init drm/amdgpu: Correct gfx ras_late_init callback drm/amdgpu: Move mmhub ras block init to ras sw_init drm/amdgpu: Move hdp ras block init to ras sw_init drm/amdgpu: Rework mca ras sw_init drm/amdgpu: Rework xgmi_wafl_pcs ras sw_init drm/amdgpu: Rework pcie_bif ras sw_init drm/amdgpu: drop ras check at asic level for new blocks drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 41 +++++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c | 48 +++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 29 +++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 72 +++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 9 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c | 46 +++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c | 23 ++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 20 +++---- drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 30 ++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 29 +++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 28 +++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 1 + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 26 ++------ drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 21 ++----- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 59 +++++++------------ drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 5 -- drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 6 +- drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 6 +- drivers/gpu/drm/amd/amdgpu/mca_v3_0.c | 44 +------------- drivers/gpu/drm/amd/amdgpu/mca_v3_0.h | 4 +- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 6 +- drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 6 +- 31 files changed, 389 insertions(+), 186 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c -- 2.17.1
