Merge tag 'trace-tools-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/trace...

[J-linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_nbio.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c
index 37d779b8e4a6aea6b48018e401f37e77ccbff692..a3bc00577a7c3151f449e9bc8e05dcec1b3a2a6d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c
@@ -22,6 +22,29 @@
 #include "amdgpu.h"
 #include "amdgpu_ras.h"
 
+int amdgpu_nbio_ras_sw_init(struct amdgpu_device *adev)
+{
+       int err;
+       struct amdgpu_nbio_ras *ras;
+
+       if (!adev->nbio.ras)
+               return 0;
+
+       ras = adev->nbio.ras;
+       err = amdgpu_ras_register_ras_block(adev, &ras->ras_block);
+       if (err) {
+               dev_err(adev->dev, "Failed to register pcie_bif ras block!\n");
+               return err;
+       }
+
+       strcpy(ras->ras_block.ras_comm.name, "pcie_bif");
+       ras->ras_block.ras_comm.block = AMDGPU_RAS_BLOCK__PCIE_BIF;
+       ras->ras_block.ras_comm.type = AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE;
+       adev->nbio.ras_if = &ras->ras_block.ras_comm;
+
+       return 0;
+}
+
 int amdgpu_nbio_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block)
 {
        int r;