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
|
From 85c2fec6528038bd200c4999978a7c2a7e86a407 Mon Sep 17 00:00:00 2001
From: Naushir Patuck <naush@raspberrypi.com>
Date: Thu, 3 Mar 2022 16:45:53 +0000
Subject: [PATCH] drivers: staging: bcm2835-isp: Do not cleanup mmal
vcsm buffer on stop_streaming
On stop_streaming() the vcsm buffer handle gets released by the buffer cleanup
code. This will subsequently cause and error if userland re-queues the same
buffer on the next start_streaming() call.
Remove this cleanup code and rely on the vb2_ops->buf_cleanup() call to do the
cleanups instead.
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
---
.../staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c | 9 ---------
1 file changed, 9 deletions(-)
--- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
+++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
@@ -622,7 +622,6 @@ static void bcm2835_isp_node_stop_stream
{
struct bcm2835_isp_node *node = vb2_get_drv_priv(q);
struct bcm2835_isp_dev *dev = node_get_dev(node);
- unsigned int i;
int ret;
v4l2_dbg(1, debug, &dev->v4l2_dev, "%s: node %s[%d], mmal port %p\n",
@@ -653,14 +652,6 @@ static void bcm2835_isp_node_stop_stream
}
}
- /* Release the VCSM handle here to release the associated dmabuf */
- for (i = 0; i < q->num_buffers; i++) {
- struct vb2_v4l2_buffer *vb2 = to_vb2_v4l2_buffer(q->bufs[i]);
- struct bcm2835_isp_buffer *buf =
- container_of(vb2, struct bcm2835_isp_buffer, vb);
- bcm2835_isp_mmal_buf_cleanup(&buf->mmal);
- }
-
atomic_dec(&dev->num_streaming);
/* If all ports disabled, then disable the component */
if (atomic_read(&dev->num_streaming) == 0) {
|
