iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: imx: imx7-media-csi: Split imx7_csi_dma_stop()

Browse Source 
The imx7_csi_dma_stop() function performs two operations, it waits for
DMA to be complete, and then cleans up and frees buffers. Split the
second part out to a new imx7_csi_dma_cleanup() function to match
imx7_csi_dma_setup(), in preparation for a stream start refactoring.

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:05 +01:00 committed by Mauro Carvalho Chehab
parent be1158f0f6
commit b0f4a7f77c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/staging/media/imx/imx7-media-csi.c
View File

@ -462,6 +462,12 @@ static int imx7_csi_dma_setup(struct imx7_csi *csi)
return 0;
}
static void imx7_csi_dma_cleanup(struct imx7_csi *csi)
{
imx7_csi_dma_unsetup_vb2_buf(csi, VB2_BUF_STATE_ERROR);
imx_media_free_dma_buf(csi->dev, &csi->underrun_buf);
}
static void imx7_csi_dma_stop(struct imx7_csi *csi)
{
unsigned long timeout_jiffies;
@ -483,10 +489,6 @@ static void imx7_csi_dma_stop(struct imx7_csi *csi)
v4l2_warn(&csi->sd, "wait last EOF timeout\n");
imx7_csi_hw_disable_irq(csi);
imx7_csi_dma_unsetup_vb2_buf(csi, VB2_BUF_STATE_ERROR);
imx_media_free_dma_buf(csi->dev, &csi->underrun_buf);
}
static void imx7_csi_configure(struct imx7_csi *csi)
@ -627,6 +629,7 @@ static int imx7_csi_streaming_start(struct imx7_csi *csi)
static int imx7_csi_streaming_stop(struct imx7_csi *csi)
{
imx7_csi_dma_stop(csi);
imx7_csi_dma_cleanup(csi);
imx7_csi_disable(csi);