blob: f863e4694fbc4915fc6b8e3a09f2fa62167dea8e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
From 320838e297c604a51ae37e6e55983c880ced9f42 Mon Sep 17 00:00:00 2001
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
Date: Wed, 13 May 2020 18:28:27 +0100
Subject: [PATCH] media: bcm2835-unicam: Always service interrupts
From when bringing up the driver, there was a check in the isr
to ignore interrupts (claiming them handled) should the driver
not be streaming.
The VPU now will not register a camera driver if it finds a
CSI2 node enabled in device tree, therefore this flawed check is
redundant.
https://github.com/raspberrypi/linux/issues/3602
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
---
drivers/media/platform/bcm2835/bcm2835-unicam.c | 15 ---------------
1 file changed, 15 deletions(-)
--- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
@@ -766,12 +766,6 @@ static int unicam_all_nodes_streaming(st
return ret;
}
-static int unicam_all_nodes_disabled(struct unicam_device *dev)
-{
- return !dev->node[IMAGE_PAD].streaming &&
- !dev->node[METADATA_PAD].streaming;
-}
-
static void unicam_queue_event_sof(struct unicam_device *unicam)
{
struct v4l2_event event = {
@@ -801,15 +795,6 @@ static irqreturn_t unicam_isr(int irq, v
u64 ts;
int i;
- /*
- * Don't service interrupts if not streaming.
- * Avoids issues if the VPU should enable the
- * peripheral without the kernel knowing (that
- * shouldn't happen, but causes issues if it does).
- */
- if (unicam_all_nodes_disabled(unicam))
- return IRQ_HANDLED;
-
sta = reg_read(cfg, UNICAM_STA);
/* Write value back to clear the interrupts */
reg_write(cfg, UNICAM_STA, sta);
|
