Commit f4dbfbc7 authored by Niklas Söderlund's avatar Niklas Söderlund Committed by Mauro Carvalho Chehab

[media] rcar-vin: move pad lookup to async bound handler

Information about pads will be needed when enumerating the media bus
codes in the async complete handler which is run before
rvin_v4l2_probe(). Move the pad lookup to the async bound handler so
they are available when needed.
Signed-off-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
[hans.verkuil@cisco.com: fix typo: surce -> source]
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 5de75b1d
...@@ -31,6 +31,20 @@ ...@@ -31,6 +31,20 @@
#define notifier_to_vin(n) container_of(n, struct rvin_dev, notifier) #define notifier_to_vin(n) container_of(n, struct rvin_dev, notifier)
static int rvin_find_pad(struct v4l2_subdev *sd, int direction)
{
unsigned int pad;
if (sd->entity.num_pads <= 1)
return 0;
for (pad = 0; pad < sd->entity.num_pads; pad++)
if (sd->entity.pads[pad].flags & direction)
return pad;
return -EINVAL;
}
static bool rvin_mbus_supported(struct rvin_graph_entity *entity) static bool rvin_mbus_supported(struct rvin_graph_entity *entity)
{ {
struct v4l2_subdev *sd = entity->subdev; struct v4l2_subdev *sd = entity->subdev;
...@@ -101,13 +115,27 @@ static int rvin_digital_notify_bound(struct v4l2_async_notifier *notifier, ...@@ -101,13 +115,27 @@ static int rvin_digital_notify_bound(struct v4l2_async_notifier *notifier,
struct v4l2_async_subdev *asd) struct v4l2_async_subdev *asd)
{ {
struct rvin_dev *vin = notifier_to_vin(notifier); struct rvin_dev *vin = notifier_to_vin(notifier);
int ret;
v4l2_set_subdev_hostdata(subdev, vin); v4l2_set_subdev_hostdata(subdev, vin);
if (vin->digital.asd.match.fwnode.fwnode == if (vin->digital.asd.match.fwnode.fwnode ==
of_fwnode_handle(subdev->dev->of_node)) { of_fwnode_handle(subdev->dev->of_node)) {
vin_dbg(vin, "bound digital subdev %s\n", subdev->name); /* Find source and sink pad of remote subdevice */
ret = rvin_find_pad(subdev, MEDIA_PAD_FL_SOURCE);
if (ret < 0)
return ret;
vin->digital.source_pad = ret;
ret = rvin_find_pad(subdev, MEDIA_PAD_FL_SINK);
vin->digital.sink_pad = ret < 0 ? 0 : ret;
vin->digital.subdev = subdev; vin->digital.subdev = subdev;
vin_dbg(vin, "bound subdev %s source pad: %u sink pad: %u\n",
subdev->name, vin->digital.source_pad,
vin->digital.sink_pad);
return 0; return 0;
} }
......
...@@ -870,20 +870,6 @@ static void rvin_notify(struct v4l2_subdev *sd, ...@@ -870,20 +870,6 @@ static void rvin_notify(struct v4l2_subdev *sd,
} }
} }
static int rvin_find_pad(struct v4l2_subdev *sd, int direction)
{
unsigned int pad;
if (sd->entity.num_pads <= 1)
return 0;
for (pad = 0; pad < sd->entity.num_pads; pad++)
if (sd->entity.pads[pad].flags & direction)
return pad;
return -EINVAL;
}
int rvin_v4l2_probe(struct rvin_dev *vin) int rvin_v4l2_probe(struct rvin_dev *vin)
{ {
struct video_device *vdev = &vin->vdev; struct video_device *vdev = &vin->vdev;
...@@ -934,14 +920,6 @@ int rvin_v4l2_probe(struct rvin_dev *vin) ...@@ -934,14 +920,6 @@ 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;
ret = rvin_find_pad(sd, MEDIA_PAD_FL_SOURCE);
if (ret < 0)
return ret;
vin->digital.source_pad = ret;
ret = rvin_find_pad(sd, MEDIA_PAD_FL_SINK);
vin->digital.sink_pad = ret < 0 ? 0 : ret;
vin->format.pixelformat = RVIN_DEFAULT_FORMAT; vin->format.pixelformat = RVIN_DEFAULT_FORMAT;
rvin_reset_format(vin); rvin_reset_format(vin);
......
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