aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3251-drm-amdgpu-support-ce-interrupt-in-ras-module.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3251-drm-amdgpu-support-ce-interrupt-in-ras-module.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3251-drm-amdgpu-support-ce-interrupt-in-ras-module.patch49
1 files changed, 49 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3251-drm-amdgpu-support-ce-interrupt-in-ras-module.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3251-drm-amdgpu-support-ce-interrupt-in-ras-module.patch
new file mode 100644
index 00000000..8a4c233b
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3251-drm-amdgpu-support-ce-interrupt-in-ras-module.patch
@@ -0,0 +1,49 @@
+From ab56d79eeae10a3013d0d83b36d819ab45e81576 Mon Sep 17 00:00:00 2001
+From: Tao Zhou <tao.zhou1@amd.com>
+Date: Mon, 29 Jul 2019 16:04:33 +0800
+Subject: [PATCH 3251/4256] drm/amdgpu: support ce interrupt in ras module
+
+correctable error can also trigger interrupt in some ras blocks
+
+Signed-off-by: Tao Zhou <tao.zhou1@amd.com>
+Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+index 094c27000b83..4a0dc5269ddf 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+@@ -1047,12 +1047,12 @@ static void amdgpu_ras_interrupt_handler(struct ras_manager *obj)
+ * the error.
+ */
+ if (ret == AMDGPU_RAS_UE) {
++ /* these counts could be left as 0 if
++ * some blocks do not count error number
++ */
+ obj->err_data.ue_count += err_data.ue_count;
++ obj->err_data.ce_count += err_data.ce_count;
+ }
+- /* Might need get ce count by register, but not all IP
+- * saves ce count, some IP just use one bit or two bits
+- * to indicate ce happened.
+- */
+ }
+ }
+ }
+@@ -1549,6 +1549,10 @@ int amdgpu_ras_init(struct amdgpu_device *adev)
+ if (amdgpu_ras_fs_init(adev))
+ goto fs_out;
+
++ /* ras init for each ras block */
++ if (adev->umc.funcs->ras_init)
++ adev->umc.funcs->ras_init(adev);
++
+ DRM_INFO("RAS INFO: ras initialized successfully, "
+ "hardware ability[%x] ras_mask[%x]\n",
+ con->hw_supported, con->supported);
+--
+2.17.1
+