aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.19/950-0584-drm-v3d-Update-to-upstream-IRQ-code.patch
diff options
context:
space:
mode:
authorÁlvaro Fernández Rojas <noltari@gmail.com>2019-08-09 19:50:30 +0200
committerÁlvaro Fernández Rojas <noltari@gmail.com>2019-08-27 11:10:01 +0200
commit2340c646e6a5da658e114be2f721ff90853588d4 (patch)
treedf9744d2344e71e8c5d1b75c3e1528bc474313fe /target/linux/brcm2708/patches-4.19/950-0584-drm-v3d-Update-to-upstream-IRQ-code.patch
parent81d0da118694feb874f992093063a2852285d194 (diff)
downloadupstream-2340c646e6a5da658e114be2f721ff90853588d4.tar.gz
upstream-2340c646e6a5da658e114be2f721ff90853588d4.tar.bz2
upstream-2340c646e6a5da658e114be2f721ff90853588d4.zip
brcm2708: update to latest patches from RPi foundation
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.19/950-0584-drm-v3d-Update-to-upstream-IRQ-code.patch')
-rw-r--r--target/linux/brcm2708/patches-4.19/950-0584-drm-v3d-Update-to-upstream-IRQ-code.patch59
1 files changed, 59 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.19/950-0584-drm-v3d-Update-to-upstream-IRQ-code.patch b/target/linux/brcm2708/patches-4.19/950-0584-drm-v3d-Update-to-upstream-IRQ-code.patch
new file mode 100644
index 0000000000..a4e9e6fea3
--- /dev/null
+++ b/target/linux/brcm2708/patches-4.19/950-0584-drm-v3d-Update-to-upstream-IRQ-code.patch
@@ -0,0 +1,59 @@
+From c6e6c508b5ab90ac310b9686fd63732c05e07b06 Mon Sep 17 00:00:00 2001
+From: Eric Anholt <eric@anholt.net>
+Date: Tue, 12 Mar 2019 09:08:10 -0700
+Subject: [PATCH 584/773] drm/v3d: Update to upstream IRQ code.
+
+---
+ drivers/gpu/drm/v3d/v3d_irq.c | 25 +++++++++++++++----------
+ 1 file changed, 15 insertions(+), 10 deletions(-)
+
+--- a/drivers/gpu/drm/v3d/v3d_irq.c
++++ b/drivers/gpu/drm/v3d/v3d_irq.c
+@@ -168,7 +168,7 @@ v3d_hub_irq(int irq, void *arg)
+ int
+ v3d_irq_init(struct v3d_dev *v3d)
+ {
+- int ret, core;
++ int irq1, ret, core;
+
+ INIT_WORK(&v3d->overflow_mem_work, v3d_overflow_mem_work);
+
+@@ -179,24 +179,29 @@ v3d_irq_init(struct v3d_dev *v3d)
+ V3D_CORE_WRITE(core, V3D_CTL_INT_CLR, V3D_CORE_IRQS);
+ V3D_WRITE(V3D_HUB_INT_CLR, V3D_HUB_IRQS);
+
+- if (platform_get_irq(v3d->pdev, 1) < 0) {
+- ret = devm_request_irq(v3d->dev, platform_get_irq(v3d->pdev, 0),
++ irq1 = platform_get_irq(v3d->pdev, 1);
++ if (irq1 == -EPROBE_DEFER)
++ return irq1;
++ if (irq1 > 0) {
++ ret = devm_request_irq(v3d->dev, irq1,
+ v3d_irq, IRQF_SHARED,
+- "v3d", v3d);
+- v3d->single_irq_line = true;
+- } else {
++ "v3d_core0", v3d);
++ if (ret)
++ goto fail;
+ ret = devm_request_irq(v3d->dev, platform_get_irq(v3d->pdev, 0),
+ v3d_hub_irq, IRQF_SHARED,
+ "v3d_hub", v3d);
+ if (ret)
+ goto fail;
++ } else {
++ v3d->single_irq_line = true;
+
+- ret = devm_request_irq(v3d->dev, platform_get_irq(v3d->pdev, 1),
++ ret = devm_request_irq(v3d->dev, platform_get_irq(v3d->pdev, 0),
+ v3d_irq, IRQF_SHARED,
+- "v3d_core0", v3d);
++ "v3d", v3d);
++ if (ret)
++ goto fail;
+ }
+- if (ret)
+- goto fail;
+
+ v3d_irq_enable(v3d);
+ return 0;