mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-23 01:10:04 +00:00
Code Issues Releases Wiki Activity

media: imx: imx7-media-csi: Move CSI configuration before source start

Browse source 
There's no reason to delay the CSI configuration and the DMA setup after
starting the source. Move it before, simplifying error handling at
stream start.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Rui Miguel Silva <rmfrfs@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Laurent Pinchart 2021-02-15 05:27:06 +01:00 committed by Mauro Carvalho Chehab
parent b0f4a7f77c
commit ff43ca9119
1 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
drivers/staging/media/imx/imx7-media-csi.c
View file

@ -577,15 +577,23 @@ static int imx7_csi_init(struct imx7_csi *csi)
ret = clk_prepare_enable(csi->mclk);
if (ret < 0)
return ret;
imx7_csi_hw_reset(csi);
imx7_csi_init_interface(csi);
imx7_csi_dmareq_rff_enable(csi);
ret = imx7_csi_dma_setup(csi);
if (ret < 0)
return ret;
imx7_csi_configure(csi);
return 0;
}
static void imx7_csi_deinit(struct imx7_csi *csi)
{
imx7_csi_dma_cleanup(csi);
imx7_csi_hw_reset(csi);
imx7_csi_init_interface(csi);
imx7_csi_dmareq_rff_disable(csi);
@ -612,24 +620,14 @@ static void imx7_csi_disable(struct imx7_csi *csi)
imx7_csi_hw_disable(csi);
}
static int imx7_csi_streaming_start(struct imx7_csi *csi)
static void imx7_csi_streaming_start(struct imx7_csi *csi)
{
int ret;
ret = imx7_csi_dma_setup(csi);
if (ret < 0)
return ret;
imx7_csi_configure(csi);
imx7_csi_enable(csi);
return 0;
}
static int imx7_csi_streaming_stop(struct imx7_csi *csi)
{
imx7_csi_dma_stop(csi);
imx7_csi_dma_cleanup(csi);
imx7_csi_disable(csi);
@ -769,12 +767,7 @@ static int imx7_csi_s_stream(struct v4l2_subdev *sd, int enable)
goto out_unlock;
}
ret = imx7_csi_streaming_start(csi);
if (ret < 0) {
v4l2_subdev_call(csi->src_sd, video, s_stream, 0);
imx7_csi_deinit(csi);
goto out_unlock;
}
imx7_csi_streaming_start(csi);
} else {
imx7_csi_streaming_stop(csi);