raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 01:49:46 +00:00
Code Issues Projects Releases Wiki Activity

media: bcm2835-unicam: Start and stop media_pipeline with same node

Browse Source 
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>
This commit is contained in:
Dave Stevenson
2023-03-28 13:43:43 +01:00
committed by Dom Cobley
parent df7df636b5
commit 070b91d3d9
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/platform/bcm2835/bcm2835-unicam.c
View File

@@ -2539,7 +2539,8 @@ static int unicam_start_streaming(struct vb2_queue *vq, unsigned int count)
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;
@@ -2633,7 +2634,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: