| Message ID | 1464203409-1279-2-git-send-email-niklas.soderlund@ragnatech.se (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
Hello Niklas, Thank you for the patch. On Wednesday 25 May 2016 21:10:02 Niklas Söderlund wrote: > From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> > > Add detection of source pad number for drivers aware of the media controller > API, so that rcar-vin can create device nodes to support modern drivers > such as adv7604.c (for HDMI on Lager) and the converted adv7180.c (for > composite) underneath. > > Building rcar_vin gains a dependency on CONFIG_MEDIA_CONTROLLER, in > line with requirements for building the drivers associated with it. > > Signed-off-by: William Towle <william.towle@codethink.co.uk> > Signed-off-by: Rob Taylor <rob.taylor@codethink.co.uk> > [uli: adapted to rcar-vin rewrite] > Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> > Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> > --- > drivers/media/platform/rcar-vin/rcar-v4l2.c | 16 ++++++++++++++++ > drivers/media/platform/rcar-vin/rcar-vin.h | 2 ++ > 2 files changed, 18 insertions(+) > > diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c > b/drivers/media/platform/rcar-vin/rcar-v4l2.c index 0bc4487..929816b 100644 > --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c > +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c > @@ -683,6 +683,9 @@ int rvin_v4l2_probe(struct rvin_dev *vin) > struct v4l2_mbus_framefmt *mf = &fmt.format; > struct video_device *vdev = &vin->vdev; > struct v4l2_subdev *sd = vin_to_source(vin); > +#if defined(CONFIG_MEDIA_CONTROLLER) I think you can get rid of conditional compilation here and below. Patch 2/8 calls v4l2_subdev_alloc_pad_config() unconditionally, which depends on CONFIG_MEDIA_CONTROLLER. > + int pad_idx; > +#endif > int ret; > > v4l2_set_subdev_hostdata(sd, vin); > @@ -729,6 +732,19 @@ int rvin_v4l2_probe(struct rvin_dev *vin) > vdev->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING | > V4L2_CAP_READWRITE; > > + vin->src_pad_idx = 0; > +#if defined(CONFIG_MEDIA_CONTROLLER) > + for (pad_idx = 0; pad_idx < sd->entity.num_pads; pad_idx++) > + if (sd->entity.pads[pad_idx].flags > + == MEDIA_PAD_FL_SOURCE) No need for a line break. > + break; > + if (pad_idx >= sd->entity.num_pads) > + return -EINVAL; > + > + vin->src_pad_idx = pad_idx; > +#endif > + fmt.pad = vin->src_pad_idx; > + > /* Try to improve our guess of a reasonable window format */ > ret = v4l2_subdev_call(sd, pad, get_fmt, NULL, &fmt); > if (ret) { > diff --git a/drivers/media/platform/rcar-vin/rcar-vin.h > b/drivers/media/platform/rcar-vin/rcar-vin.h index 544a3b3..a6dd6db 100644 > --- a/drivers/media/platform/rcar-vin/rcar-vin.h > +++ b/drivers/media/platform/rcar-vin/rcar-vin.h > @@ -87,6 +87,7 @@ struct rvin_graph_entity { > * > * @vdev: V4L2 video device associated with VIN > * @v4l2_dev: V4L2 device > + * @src_pad_idx: source pad index for media controller drivers > * @ctrl_handler: V4L2 control handler > * @notifier: V4L2 asynchronous subdevs notifier > * @entity: entity in the DT for subdevice > @@ -117,6 +118,7 @@ struct rvin_dev { > > struct video_device vdev; > struct v4l2_device v4l2_dev; > + int src_pad_idx; > struct v4l2_ctrl_handler ctrl_handler; > struct v4l2_async_notifier notifier; > struct rvin_graph_entity entity;
diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c index 0bc4487..929816b 100644 --- a/drivers/media/platform/rcar-vin/rcar-v4l2.c +++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c @@ -683,6 +683,9 @@ int rvin_v4l2_probe(struct rvin_dev *vin) struct v4l2_mbus_framefmt *mf = &fmt.format; struct video_device *vdev = &vin->vdev; struct v4l2_subdev *sd = vin_to_source(vin); +#if defined(CONFIG_MEDIA_CONTROLLER) + int pad_idx; +#endif int ret; v4l2_set_subdev_hostdata(sd, vin); @@ -729,6 +732,19 @@ int rvin_v4l2_probe(struct rvin_dev *vin) vdev->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING | V4L2_CAP_READWRITE; + vin->src_pad_idx = 0; +#if defined(CONFIG_MEDIA_CONTROLLER) + for (pad_idx = 0; pad_idx < sd->entity.num_pads; pad_idx++) + if (sd->entity.pads[pad_idx].flags + == MEDIA_PAD_FL_SOURCE) + break; + if (pad_idx >= sd->entity.num_pads) + return -EINVAL; + + vin->src_pad_idx = pad_idx; +#endif + fmt.pad = vin->src_pad_idx; + /* Try to improve our guess of a reasonable window format */ ret = v4l2_subdev_call(sd, pad, get_fmt, NULL, &fmt); if (ret) { diff --git a/drivers/media/platform/rcar-vin/rcar-vin.h b/drivers/media/platform/rcar-vin/rcar-vin.h index 544a3b3..a6dd6db 100644 --- a/drivers/media/platform/rcar-vin/rcar-vin.h +++ b/drivers/media/platform/rcar-vin/rcar-vin.h @@ -87,6 +87,7 @@ struct rvin_graph_entity { * * @vdev: V4L2 video device associated with VIN * @v4l2_dev: V4L2 device + * @src_pad_idx: source pad index for media controller drivers * @ctrl_handler: V4L2 control handler * @notifier: V4L2 asynchronous subdevs notifier * @entity: entity in the DT for subdevice @@ -117,6 +118,7 @@ struct rvin_dev { struct video_device vdev; struct v4l2_device v4l2_dev; + int src_pad_idx; struct v4l2_ctrl_handler ctrl_handler; struct v4l2_async_notifier notifier; struct rvin_graph_entity entity;