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 e43d09e8749afa7fdfdd83439690d304b5acc98d Mon Sep 17 00:00:00 2001
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
Date: Tue, 28 Mar 2023 13:43:43 +0100
Subject: [PATCH] media: bcm2835-unicam: Start and stop media_pipeline
with same node
media_pipeline_start and media_pipeline_stop now validate that
the pipeline is being started and stopped with the same pipe
and pad handles.
When running with embedded metadata (eg imx477 and imx708), the
start typically happens from the metadata pad, whilst stop is
always from the image pad.
Always pass the image pad to media_pipeline_start to ensure
that the calls are balanced.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
---
drivers/media/platform/bcm2835/bcm2835-unicam.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
+++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
@@ -2524,7 +2524,8 @@ static int unicam_start_streaming(struct
goto err_streaming;
}
- ret = media_pipeline_start(node->video_dev.entity.pads, &node->pipe);
+ ret = media_pipeline_start(dev->node[IMAGE_PAD].video_dev.entity.pads,
+ &dev->node[IMAGE_PAD].pipe);
if (ret < 0) {
unicam_err(dev, "Failed to start media pipeline: %d\n", ret);
goto err_pm_put;
@@ -2618,7 +2619,8 @@ err_vpu_clock:
unicam_err(dev, "failed to reset the VPU clock\n");
clk_disable_unprepare(dev->vpu_clock);
error_pipeline:
- media_pipeline_stop(node->video_dev.entity.pads);
+ if (node->pad_id == IMAGE_PAD)
+ media_pipeline_stop(dev->node[IMAGE_PAD].video_dev.entity.pads);
err_pm_put:
unicam_runtime_put(dev);
err_streaming:
|