1 From 50088003d803f04e536eb09ac2635df35b5c8ae4 Mon Sep 17 00:00:00 2001
2 From: Eric Anholt <eric@anholt.net>
3 Date: Tue, 12 Mar 2019 09:08:10 -0700
4 Subject: [PATCH] drm/v3d: Update to upstream IRQ code.
7 drivers/gpu/drm/v3d/v3d_irq.c | 25 +++++++++++++++----------
8 1 file changed, 15 insertions(+), 10 deletions(-)
10 --- a/drivers/gpu/drm/v3d/v3d_irq.c
11 +++ b/drivers/gpu/drm/v3d/v3d_irq.c
12 @@ -168,7 +168,7 @@ v3d_hub_irq(int irq, void *arg)
14 v3d_irq_init(struct v3d_dev *v3d)
17 + int irq1, ret, core;
19 INIT_WORK(&v3d->overflow_mem_work, v3d_overflow_mem_work);
21 @@ -179,24 +179,29 @@ v3d_irq_init(struct v3d_dev *v3d)
22 V3D_CORE_WRITE(core, V3D_CTL_INT_CLR, V3D_CORE_IRQS);
23 V3D_WRITE(V3D_HUB_INT_CLR, V3D_HUB_IRQS);
25 - if (platform_get_irq(v3d->pdev, 1) < 0) {
26 - ret = devm_request_irq(v3d->dev, platform_get_irq(v3d->pdev, 0),
27 + irq1 = platform_get_irq(v3d->pdev, 1);
28 + if (irq1 == -EPROBE_DEFER)
31 + ret = devm_request_irq(v3d->dev, irq1,
34 - v3d->single_irq_line = true;
39 ret = devm_request_irq(v3d->dev, platform_get_irq(v3d->pdev, 0),
40 v3d_hub_irq, IRQF_SHARED,
45 + v3d->single_irq_line = true;
47 - ret = devm_request_irq(v3d->dev, platform_get_irq(v3d->pdev, 1),
48 + ret = devm_request_irq(v3d->dev, platform_get_irq(v3d->pdev, 0),