Commit fa037403 authored by Ulrich Hecht's avatar Ulrich Hecht Committed by Mauro Carvalho Chehab

[media] media: rcar-vin: pad-aware driver initialisation

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: default avatarWilliam Towle <william.towle@codethink.co.uk>
Signed-off-by: default avatarRob Taylor <rob.taylor@codethink.co.uk>
[ulrich.hecht+renesas@gmail.com: adapted to rcar-vin rewrite]
Signed-off-by: default avatarUlrich Hecht <ulrich.hecht+renesas@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 904aef0f
...@@ -683,6 +683,9 @@ int rvin_v4l2_probe(struct rvin_dev *vin) ...@@ -683,6 +683,9 @@ int rvin_v4l2_probe(struct rvin_dev *vin)
struct v4l2_mbus_framefmt *mf = &fmt.format; struct v4l2_mbus_framefmt *mf = &fmt.format;
struct video_device *vdev = &vin->vdev; struct video_device *vdev = &vin->vdev;
struct v4l2_subdev *sd = vin_to_source(vin); struct v4l2_subdev *sd = vin_to_source(vin);
#if defined(CONFIG_MEDIA_CONTROLLER)
int pad_idx;
#endif
int ret; int ret;
v4l2_set_subdev_hostdata(sd, vin); v4l2_set_subdev_hostdata(sd, vin);
...@@ -729,6 +732,19 @@ int rvin_v4l2_probe(struct rvin_dev *vin) ...@@ -729,6 +732,19 @@ int rvin_v4l2_probe(struct rvin_dev *vin)
vdev->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING | vdev->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING |
V4L2_CAP_READWRITE; 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 */ /* Try to improve our guess of a reasonable window format */
ret = v4l2_subdev_call(sd, pad, get_fmt, NULL, &fmt); ret = v4l2_subdev_call(sd, pad, get_fmt, NULL, &fmt);
if (ret) { if (ret) {
......
...@@ -87,6 +87,7 @@ struct rvin_graph_entity { ...@@ -87,6 +87,7 @@ struct rvin_graph_entity {
* *
* @vdev: V4L2 video device associated with VIN * @vdev: V4L2 video device associated with VIN
* @v4l2_dev: V4L2 device * @v4l2_dev: V4L2 device
* @src_pad_idx: source pad index for media controller drivers
* @ctrl_handler: V4L2 control handler * @ctrl_handler: V4L2 control handler
* @notifier: V4L2 asynchronous subdevs notifier * @notifier: V4L2 asynchronous subdevs notifier
* @entity: entity in the DT for subdevice * @entity: entity in the DT for subdevice
...@@ -117,6 +118,7 @@ struct rvin_dev { ...@@ -117,6 +118,7 @@ struct rvin_dev {
struct video_device vdev; struct video_device vdev;
struct v4l2_device v4l2_dev; struct v4l2_device v4l2_dev;
int src_pad_idx;
struct v4l2_ctrl_handler ctrl_handler; struct v4l2_ctrl_handler ctrl_handler;
struct v4l2_async_notifier notifier; struct v4l2_async_notifier notifier;
struct rvin_graph_entity entity; struct rvin_graph_entity entity;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment