Re: [PATCH v3 28/33] omap3isp: Move setting constaints above media_entity_pipeline_start

Laurent Pinchart
2012-02-22T11:12:54Z

Hi Sakari,

Thanks for the patch.

On Monday 20 February 2012 03:57:07 Sakari Ailus wrote:

Could you please briefly explain why this is needed ?

> Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
> ---
> drivers/media/video/omap3isp/ispvideo.c | 11 +++++------
> 1 files changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/media/video/omap3isp/ispvideo.c
> b/drivers/media/video/omap3isp/ispvideo.c index f1c68ca..2e4786d 100644
> --- a/drivers/media/video/omap3isp/ispvideo.c
> +++ b/drivers/media/video/omap3isp/ispvideo.c
> @@ -304,8 +304,6 @@ static int isp_video_validate_pipeline(struct
> isp_pipeline *pipe) struct v4l2_subdev *subdev;
> int ret;
>
> - pipe->max_rate = pipe->l3_ick;
> -
> subdev = isp_video_remote_subdev(pipe->output, NULL);
> if (subdev == NULL)
> return -EPIPE;
> @@ -997,6 +995,11 @@ isp_video_streamon(struct file *file, void *fh, enum
> v4l2_buf_type type) pipe->external_rate = 0;
> pipe->external_bpp = 0;
>
> + if (video->isp->pdata->set_constraints)
> + video->isp->pdata->set_constraints(video->isp, true);
> + pipe->l3_ick = clk_get_rate(video->isp->clock[ISP_CLK_L3_ICK]);
> + pipe->max_rate = pipe->l3_ick;
> +
> ret = media_entity_pipeline_start(&video->video.entity, &pipe->pipe);
> if (ret < 0)
> goto err_media_entity_pipeline_start;
> @@ -1031,10 +1034,6 @@ isp_video_streamon(struct file *file, void *fh, enum
> v4l2_buf_type type) pipe->output = far_end;
> }
>
> - if (video->isp->pdata->set_constraints)
> - video->isp->pdata->set_constraints(video->isp, true);
> - pipe->l3_ick = clk_get_rate(video->isp->clock[ISP_CLK_L3_ICK]);
> -
> /* Validate the pipeline and update its state. */
> ret = isp_video_validate_pipeline(pipe);
> if (ret < 0)
--
Regards,

Laurent Pinchart