aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3687-drm-amdgpu-irq-check-if-nbio-funcs-exist.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3687-drm-amdgpu-irq-check-if-nbio-funcs-exist.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3687-drm-amdgpu-irq-check-if-nbio-funcs-exist.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3687-drm-amdgpu-irq-check-if-nbio-funcs-exist.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3687-drm-amdgpu-irq-check-if-nbio-funcs-exist.patch
new file mode 100644
index 00000000..baac8394
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3687-drm-amdgpu-irq-check-if-nbio-funcs-exist.patch
@@ -0,0 +1,36 @@
+From 76309b4cb3c8bf80bb6722092f21948c1fdf3c2d Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Sun, 1 Sep 2019 12:31:42 -0500
+Subject: [PATCH 3687/4256] drm/amdgpu/irq: check if nbio funcs exist
+
+We need to check if the nbios funcs exist before
+checking the individual pointers.
+
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
+index f89c81e66ebb..d130a30e9155 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
+@@ -156,10 +156,12 @@ irqreturn_t amdgpu_irq_handler(int irq, void *arg)
+ * register to check whether the interrupt is triggered or not, and properly
+ * ack the interrupt if it is there
+ */
+- if (adev->nbio.funcs->handle_ras_controller_intr_no_bifring)
++ if (adev->nbio.funcs &&
++ adev->nbio.funcs->handle_ras_controller_intr_no_bifring)
+ adev->nbio.funcs->handle_ras_controller_intr_no_bifring(adev);
+
+- if (adev->nbio.funcs->handle_ras_err_event_athub_intr_no_bifring)
++ if (adev->nbio.funcs &&
++ adev->nbio.funcs->handle_ras_err_event_athub_intr_no_bifring)
+ adev->nbio.funcs->handle_ras_err_event_athub_intr_no_bifring(adev);
+
+ return ret;
+--
+2.17.1
+