| Message ID | 20200807111619.3664763-2-niklas.soderlund+renesas@ragnatech.se (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | v4l: async: Switch to endpoint node matching | expand |
Hi Niklas and Sakari, Thank you for the patch. On Fri, Aug 07, 2020 at 01:16:18PM +0200, Niklas Söderlund wrote: > From: Sakari Ailus <sakari.ailus@linux.intel.com> > > V4L2 async framework can use both device's fwnode and endpoints's fwnode > for matching the async sub-device with the sub-device. In order to proceed > moving towards endpoint matching assign the endpoint to the async > sub-device. > > As most async sub-device drivers (and the related hardware) only supports > a single endpoint, use the first endpoint found. This works for all > current drivers --- we only ever supported a single async sub-device per > device to begin with. > > For async devices that have no endpoints, continue to use the fwnode > related to the device. This includes e.g. lens devices. > > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> > Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> > --- > drivers/media/v4l2-core/v4l2-async.c | 8 ++++++-- > drivers/media/v4l2-core/v4l2-fwnode.c | 2 +- > 2 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c > index e3ab003a6c851881..f3b0338718e0f0a9 100644 > --- a/drivers/media/v4l2-core/v4l2-async.c > +++ b/drivers/media/v4l2-core/v4l2-async.c > @@ -758,8 +758,12 @@ int v4l2_async_register_subdev(struct v4l2_subdev *sd) > * (struct v4l2_subdev.dev), and async sub-device does not > * exist independently of the device at any point of time. > */ > - if (!sd->fwnode && sd->dev) > - sd->fwnode = dev_fwnode(sd->dev); > + if (!sd->fwnode && sd->dev) { > + sd->fwnode = fwnode_graph_get_next_endpoint( > + dev_fwnode(sd->dev), NULL); > + if (!sd->fwnode) > + sd->fwnode = dev_fwnode(sd->dev); dev_fwnode() returns a borrowed reference, while fwnode_graph_get_next_endpoint() returns a new reference. This will cause a reference count issue, one way or another. Otherwise, I think the change is good. > + } > > mutex_lock(&list_lock); > > diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c > index a4c3c77c1894648e..79706129e28b668a 100644 > --- a/drivers/media/v4l2-core/v4l2-fwnode.c > +++ b/drivers/media/v4l2-core/v4l2-fwnode.c > @@ -815,7 +815,7 @@ v4l2_async_notifier_fwnode_parse_endpoint(struct device *dev, > > asd->match_type = V4L2_ASYNC_MATCH_FWNODE; > asd->match.fwnode = > - fwnode_graph_get_remote_port_parent(endpoint); > + fwnode_graph_get_remote_endpoint(endpoint); > if (!asd->match.fwnode) { > dev_dbg(dev, "no remote endpoint found\n"); > ret = -ENOTCONN;
diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c index e3ab003a6c851881..f3b0338718e0f0a9 100644 --- a/drivers/media/v4l2-core/v4l2-async.c +++ b/drivers/media/v4l2-core/v4l2-async.c @@ -758,8 +758,12 @@ int v4l2_async_register_subdev(struct v4l2_subdev *sd) * (struct v4l2_subdev.dev), and async sub-device does not * exist independently of the device at any point of time. */ - if (!sd->fwnode && sd->dev) - sd->fwnode = dev_fwnode(sd->dev); + if (!sd->fwnode && sd->dev) { + sd->fwnode = fwnode_graph_get_next_endpoint( + dev_fwnode(sd->dev), NULL); + if (!sd->fwnode) + sd->fwnode = dev_fwnode(sd->dev); + } mutex_lock(&list_lock); diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c index a4c3c77c1894648e..79706129e28b668a 100644 --- a/drivers/media/v4l2-core/v4l2-fwnode.c +++ b/drivers/media/v4l2-core/v4l2-fwnode.c @@ -815,7 +815,7 @@ v4l2_async_notifier_fwnode_parse_endpoint(struct device *dev, asd->match_type = V4L2_ASYNC_MATCH_FWNODE; asd->match.fwnode = - fwnode_graph_get_remote_port_parent(endpoint); + fwnode_graph_get_remote_endpoint(endpoint); if (!asd->match.fwnode) { dev_dbg(dev, "no remote endpoint found\n"); ret = -ENOTCONN;