On 07/23/2015 02:21 PM, William Towle wrote:
> From: Laurent Pinchart <laurent.pinch...@linaro.org>
> 
> Add a new subdev operation to initialize a subdev pad config array, and
> a helper function to allocate and initialize the array. This can be used
> by bridge drivers to implement try format based on subdev pad
> operations.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinch...@linaro.org>
> Acked-by: Vaibhav Hiremath <vaibhav.hirem...@linaro.org>

Acked-by: Hans Verkuil <hans.verk...@cisco.com>

Regards,

        Hans

> ---
>  drivers/media/v4l2-core/v4l2-subdev.c | 19 ++++++++++++++++++-
>  include/media/v4l2-subdev.h           | 10 ++++++++++
>  2 files changed, 28 insertions(+), 1 deletion(-)
> 
> Changes since v1:
> 
> - Added v4l2_subdev_free_pad_config
> ---
>  drivers/media/v4l2-core/v4l2-subdev.c |   19 ++++++++++++++++++-
>  include/media/v4l2-subdev.h           |   10 ++++++++++
>  2 files changed, 28 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/media/v4l2-core/v4l2-subdev.c 
> b/drivers/media/v4l2-core/v4l2-subdev.c
> index 83615b8..951a9cf 100644
> --- a/drivers/media/v4l2-core/v4l2-subdev.c
> +++ b/drivers/media/v4l2-core/v4l2-subdev.c
> @@ -35,7 +35,7 @@
>  static int subdev_fh_init(struct v4l2_subdev_fh *fh, struct v4l2_subdev *sd)
>  {
>  #if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)
> -     fh->pad = kzalloc(sizeof(*fh->pad) * sd->entity.num_pads, GFP_KERNEL);
> +     fh->pad = v4l2_subdev_alloc_pad_config(sd);
>       if (fh->pad == NULL)
>               return -ENOMEM;
>  #endif
> @@ -569,6 +569,23 @@ int v4l2_subdev_link_validate(struct media_link *link)
>               sink, link, &source_fmt, &sink_fmt);
>  }
>  EXPORT_SYMBOL_GPL(v4l2_subdev_link_validate);
> +
> +struct v4l2_subdev_pad_config *v4l2_subdev_alloc_pad_config(struct 
> v4l2_subdev *sd)
> +{
> +     struct v4l2_subdev_pad_config *cfg;
> +
> +     if (!sd->entity.num_pads)
> +             return NULL;
> +
> +     cfg = kcalloc(sd->entity.num_pads, sizeof(*cfg), GFP_KERNEL);
> +     if (!cfg)
> +             return NULL;
> +
> +     v4l2_subdev_call(sd, pad, init_cfg, cfg);
> +
> +     return cfg;
> +}
> +EXPORT_SYMBOL_GPL(v4l2_subdev_alloc_pad_config);
>  #endif /* CONFIG_MEDIA_CONTROLLER */
>  
>  void v4l2_subdev_init(struct v4l2_subdev *sd, const struct v4l2_subdev_ops 
> *ops)
> diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
> index 370fc38..a03b600 100644
> --- a/include/media/v4l2-subdev.h
> +++ b/include/media/v4l2-subdev.h
> @@ -486,6 +486,8 @@ struct v4l2_subdev_pad_config {
>   *                  may be adjusted by the subdev driver to device 
> capabilities.
>   */
>  struct v4l2_subdev_pad_ops {
> +     void (*init_cfg)(struct v4l2_subdev *sd,
> +                      struct v4l2_subdev_pad_config *cfg);
>       int (*enum_mbus_code)(struct v4l2_subdev *sd,
>                             struct v4l2_subdev_pad_config *cfg,
>                             struct v4l2_subdev_mbus_code_enum *code);
> @@ -680,7 +682,15 @@ int v4l2_subdev_link_validate_default(struct v4l2_subdev 
> *sd,
>                                     struct v4l2_subdev_format *source_fmt,
>                                     struct v4l2_subdev_format *sink_fmt);
>  int v4l2_subdev_link_validate(struct media_link *link);
> +
> +struct v4l2_subdev_pad_config *v4l2_subdev_alloc_pad_config(struct 
> v4l2_subdev *sd);
> +
> +static inline void v4l2_subdev_free_pad_config(struct v4l2_subdev_pad_config 
> *cfg)
> +{
> +     kfree(cfg);
> +}
>  #endif /* CONFIG_MEDIA_CONTROLLER */
> +
>  void v4l2_subdev_init(struct v4l2_subdev *sd,
>                     const struct v4l2_subdev_ops *ops);
>  
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to