media: imx: ic-prp: add FORMAT_TRY frame interval support
PATCH 1/1 media: imx: ic-prp: add FORMAT_TRY frame interval support
Implement frame interval handling for V4L2_SUBDEV_FORMAT_TRY by storing and retrieving per-pad intervals from the subdev state. Also add a PRP-specific init_state callback to initialize TRY intervals from the active default, and move default interval initialization to prp_init().
Signed-off-by Vickram Kapoor <[email protected]>
--- drivers/staging/media/imx/imx-ic-prp.c | 89 +++++++++++++++++++------- 1 file changed, 66 insertions(+), 23 deletions(-)
drivers/staging/media/imx/imx-ic-prp.c +66 -23
@@ -88,6 +88,18 @@ __prp_get_fmt(struct prp_priv *priv, struct v4l2_subdev_state *sd_state,return &priv->format_mbus; } +static struct v4l2_fract * +__prp_get_frame_interval (struct prp_priv *priv, +struct v4l2_subdev_state *sd_state, +unsigned int pad, +enum v4l2_subdev_format_whence which) +{ +if (which ==V4L2_SUBDEV_FORMAT_TRY ) +return v4l2_subdev_state_get_interval (sd_state, pad); + +return &priv->frame_interval; +} +/* * V4L2 subdev operations. */
@@ -398,22 +410,26 @@ static int prp_get_frame_interval(struct v4l2_subdev *sd, struct v4l2_subdev_frame_interval *fi) {struct prp_priv *priv =sd_to_priv (sd); - -/* -* FIXME: Implement support for V4L2_SUBDEV_FORMAT_TRY, using the V4L2 -* subdev active state API. -*/ -if (fi->which !=V4L2_SUBDEV_FORMAT_ACTIVE ) -return -EINVAL ; +struct v4l2_fract *interval; +int ret =0 ;if (fi->pad >=PRP_NUM_PADS )return -EINVAL ;mutex_lock (&priv->lock); - fi->interval = priv->frame_interval; + + interval =__prp_get_frame_interval (priv, sd_state, fi->pad, + fi->which); +if (!interval) { + ret = -EINVAL ; + goto out; + } + + fi->interval = *interval; +out:mutex_unlock (&priv->lock); -return 0 ; +return ret; } static int prp_set_frame_interval(struct v4l2_subdev *sd,
@@ -421,24 +437,51 @@ static int prp_set_frame_interval(struct v4l2_subdev *sd, struct v4l2_subdev_frame_interval *fi) {struct prp_priv *priv =sd_to_priv (sd); - -/* -* FIXME: Implement support for V4L2_SUBDEV_FORMAT_TRY, using the V4L2 -* subdev active state API. -*/ -if (fi->which !=V4L2_SUBDEV_FORMAT_ACTIVE ) -return -EINVAL ; +struct v4l2_fract *interval; +int ret =0 ;if (fi->pad >=PRP_NUM_PADS )return -EINVAL ;mutex_lock (&priv->lock); + interval =__prp_get_frame_interval (priv, sd_state, fi->pad, + fi->which); +if (!interval) { + ret = -EINVAL ; + goto out; + } +/* No limits on valid frame intervals */ if (fi->interval.numerator ==0 || fi->interval.denominator ==0 ) - fi->interval = priv->frame_interval; + fi->interval = *interval;else - priv->frame_interval = fi->interval; + *interval = fi->interval; +out: +mutex_unlock (&priv->lock); + +return ret; +} + +static int prp_init_state (struct v4l2_subdev *sd, +struct v4l2_subdev_state *sd_state) +{ +struct prp_priv *priv =sd_to_priv (sd); +struct v4l2_fract *interval; +unsigned int pad; +int ret; + + ret =imx_media_init_state (sd, sd_state); +if (ret) +return ret; + +mutex_lock (&priv->lock); + +for (pad =0 ; pad <PRP_NUM_PADS ; pad++) { + interval =v4l2_subdev_state_get_interval (sd_state, pad); +if (interval) + *interval = priv->frame_interval; + }mutex_unlock (&priv->lock);
@@ -450,10 +493,6 @@ static int prp_registered(struct v4l2_subdev *sd)struct prp_priv *priv =sd_to_priv (sd);u32 code; -/* init default frame interval */ - priv->frame_interval.numerator =1 ; - priv->frame_interval.denominator =30 ; -/* set a default mbus format */ imx_media_enum_ipu_formats (&code,0 ,PIXFMT_SEL_YUV );
@@ -487,7 +526,7 @@ static const struct v4l2_subdev_ops prp_subdev_ops = { };static const struct v4l2_subdev_internal_ops prp_internal_ops = { - .init_state = imx_media_init_state, + .init_state = prp_init_state, .registered = prp_registered, };
@@ -504,6 +543,10 @@ static int prp_init(struct imx_ic_priv *ic_priv) ic_priv->task_priv = priv; priv->ic_priv = ic_priv; +/* init default frame interval */ + priv->frame_interval.numerator =1 ; + priv->frame_interval.denominator =30 ; +for (i =0 ; i <PRP_NUM_PADS ; i++) priv->pad[i].flags = (i ==PRP_SINK_PAD ) ?MEDIA_PAD_FL_SINK :MEDIA_PAD_FL_SOURCE ;
Signature · 1 line
2.53.0