| Message ID | 20200303234256.8928-15-slongerbeam@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: imx: Create media links in bound notifiers | expand |
Hi Steve, Thank you for the patch. On Tue, Mar 03, 2020 at 03:42:53PM -0800, Steve Longerbeam wrote: > Fix the 1:1 port-id:pad-index assumption for the upstream subdevice, by > searching the upstream subdevice's endpoints for one that maps to the > pad's index. This is carried out by a new reverse mapping function > imx_media_get_pad_fwnode(). This gets pretty inefficient :-S I think it's fine for now, but I believe there's room for additional refactoring to avoid the need to get the upstream endpoint in the first place. > Signed-off-by: Steve Longerbeam <slongerbeam@gmail.com> > --- > drivers/staging/media/imx/imx-media-csi.c | 22 ++++---------- > drivers/staging/media/imx/imx-media-utils.c | 33 +++++++++++++++++++++ > drivers/staging/media/imx/imx-media.h | 1 + > drivers/staging/media/imx/imx7-media-csi.c | 25 +++++----------- > 4 files changed, 47 insertions(+), 34 deletions(-) > > diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c > index 59ab1cf72841..0388d73e916c 100644 > --- a/drivers/staging/media/imx/imx-media-csi.c > +++ b/drivers/staging/media/imx/imx-media-csi.c > @@ -164,7 +164,7 @@ static inline bool requires_passthrough(struct v4l2_fwnode_endpoint *ep, > static int csi_get_upstream_endpoint(struct csi_priv *priv, > struct v4l2_fwnode_endpoint *ep) > { > - struct device_node *endpoint, *port; > + struct fwnode_handle *endpoint; > struct media_entity *src; > struct v4l2_subdev *sd; > struct media_pad *pad; > @@ -203,23 +203,13 @@ static int csi_get_upstream_endpoint(struct csi_priv *priv, > if (!pad) > return -ENODEV; > > - sd = media_entity_to_v4l2_subdev(pad->entity); > + endpoint = imx_media_get_pad_fwnode(pad); > + if (IS_ERR(endpoint)) > + return PTR_ERR(endpoint); > > - /* > - * NOTE: this assumes an OF-graph port id is the same as a > - * media pad index. > - */ > - port = of_graph_get_port_by_id(sd->dev->of_node, pad->index); > - if (!port) > - return -ENODEV; > - > - endpoint = of_get_next_child(port, NULL); > - of_node_put(port); > - if (!endpoint) > - return -ENODEV; > + v4l2_fwnode_endpoint_parse(endpoint, ep); > > - v4l2_fwnode_endpoint_parse(of_fwnode_handle(endpoint), ep); > - of_node_put(endpoint); > + fwnode_handle_put(endpoint); > > return 0; > } > diff --git a/drivers/staging/media/imx/imx-media-utils.c b/drivers/staging/media/imx/imx-media-utils.c > index 87152bd9af22..61752c6b074d 100644 > --- a/drivers/staging/media/imx/imx-media-utils.c > +++ b/drivers/staging/media/imx/imx-media-utils.c > @@ -1007,6 +1007,39 @@ imx_media_pipeline_video_device(struct media_entity *start_entity, > } > EXPORT_SYMBOL_GPL(imx_media_pipeline_video_device); > > +/* > + * Find a fwnode endpoint that maps to the given subdevice's pad. > + * If there are multiple endpoints that map to the pad, only the > + * first endpoint encountered is returned. > + * > + * On success the refcount of the returned fwnode endpoint is > + * incremented. > + */ > +struct fwnode_handle *imx_media_get_pad_fwnode(struct media_pad *pad) > +{ > + struct fwnode_handle *endpoint; > + struct v4l2_subdev *sd; > + > + if (!is_media_entity_v4l2_subdev(pad->entity)) > + return ERR_PTR(-ENODEV); > + > + sd = media_entity_to_v4l2_subdev(pad->entity); > + > + fwnode_graph_for_each_endpoint(dev_fwnode(sd->dev), endpoint) { > + int pad_idx = media_entity_get_fwnode_pad(&sd->entity, > + endpoint, > + pad->flags); > + if (pad_idx < 0) > + continue; > + > + if (pad_idx == pad->index) > + return endpoint; > + } > + > + return ERR_PTR(-ENODEV); > +} > +EXPORT_SYMBOL_GPL(imx_media_get_pad_fwnode); > + > /* > * Turn current pipeline streaming on/off starting from entity. > */ > diff --git a/drivers/staging/media/imx/imx-media.h b/drivers/staging/media/imx/imx-media.h > index f90a65ba4ced..5f23d852122f 100644 > --- a/drivers/staging/media/imx/imx-media.h > +++ b/drivers/staging/media/imx/imx-media.h > @@ -205,6 +205,7 @@ imx_media_pipeline_subdev(struct media_entity *start_entity, u32 grp_id, > struct video_device * > imx_media_pipeline_video_device(struct media_entity *start_entity, > enum v4l2_buf_type buftype, bool upstream); > +struct fwnode_handle *imx_media_get_pad_fwnode(struct media_pad *pad); > > struct imx_media_dma_buf { > void *virt; > diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c > index 88e21c13e420..9b31379611ac 100644 > --- a/drivers/staging/media/imx/imx7-media-csi.c > +++ b/drivers/staging/media/imx/imx7-media-csi.c > @@ -439,9 +439,8 @@ static int imx7_csi_get_upstream_endpoint(struct imx7_csi *csi, > struct v4l2_fwnode_endpoint *ep, > bool skip_mux) > { > - struct device_node *endpoint, *port; > + struct fwnode_handle *endpoint; > struct media_entity *src; > - struct v4l2_subdev *sd; > struct media_pad *pad; > > if (!csi->src_sd) > @@ -463,29 +462,19 @@ static int imx7_csi_get_upstream_endpoint(struct imx7_csi *csi, > if (!pad) > return -ENODEV; > > - sd = media_entity_to_v4l2_subdev(pad->entity); > - > /* To get bus type we may need to skip video mux */ > if (skip_mux && src->function == MEDIA_ENT_F_VID_MUX) { > - src = &sd->entity; > + src = pad->entity; > goto skip_video_mux; > } > > - /* > - * NOTE: this assumes an OF-graph port id is the same as a > - * media pad index. > - */ > - port = of_graph_get_port_by_id(sd->dev->of_node, pad->index); > - if (!port) > - return -ENODEV; > + endpoint = imx_media_get_pad_fwnode(pad); > + if (IS_ERR(endpoint)) > + return PTR_ERR(endpoint); > > - endpoint = of_get_next_child(port, NULL); > - of_node_put(port); > - if (!endpoint) > - return -ENODEV; > + v4l2_fwnode_endpoint_parse(endpoint, ep); > > - v4l2_fwnode_endpoint_parse(of_fwnode_handle(endpoint), ep); > - of_node_put(endpoint); > + fwnode_handle_put(endpoint); > > return 0; > }
diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c index 59ab1cf72841..0388d73e916c 100644 --- a/drivers/staging/media/imx/imx-media-csi.c +++ b/drivers/staging/media/imx/imx-media-csi.c @@ -164,7 +164,7 @@ static inline bool requires_passthrough(struct v4l2_fwnode_endpoint *ep, static int csi_get_upstream_endpoint(struct csi_priv *priv, struct v4l2_fwnode_endpoint *ep) { - struct device_node *endpoint, *port; + struct fwnode_handle *endpoint; struct media_entity *src; struct v4l2_subdev *sd; struct media_pad *pad; @@ -203,23 +203,13 @@ static int csi_get_upstream_endpoint(struct csi_priv *priv, if (!pad) return -ENODEV; - sd = media_entity_to_v4l2_subdev(pad->entity); + endpoint = imx_media_get_pad_fwnode(pad); + if (IS_ERR(endpoint)) + return PTR_ERR(endpoint); - /* - * NOTE: this assumes an OF-graph port id is the same as a - * media pad index. - */ - port = of_graph_get_port_by_id(sd->dev->of_node, pad->index); - if (!port) - return -ENODEV; - - endpoint = of_get_next_child(port, NULL); - of_node_put(port); - if (!endpoint) - return -ENODEV; + v4l2_fwnode_endpoint_parse(endpoint, ep); - v4l2_fwnode_endpoint_parse(of_fwnode_handle(endpoint), ep); - of_node_put(endpoint); + fwnode_handle_put(endpoint); return 0; } diff --git a/drivers/staging/media/imx/imx-media-utils.c b/drivers/staging/media/imx/imx-media-utils.c index 87152bd9af22..61752c6b074d 100644 --- a/drivers/staging/media/imx/imx-media-utils.c +++ b/drivers/staging/media/imx/imx-media-utils.c @@ -1007,6 +1007,39 @@ imx_media_pipeline_video_device(struct media_entity *start_entity, } EXPORT_SYMBOL_GPL(imx_media_pipeline_video_device); +/* + * Find a fwnode endpoint that maps to the given subdevice's pad. + * If there are multiple endpoints that map to the pad, only the + * first endpoint encountered is returned. + * + * On success the refcount of the returned fwnode endpoint is + * incremented. + */ +struct fwnode_handle *imx_media_get_pad_fwnode(struct media_pad *pad) +{ + struct fwnode_handle *endpoint; + struct v4l2_subdev *sd; + + if (!is_media_entity_v4l2_subdev(pad->entity)) + return ERR_PTR(-ENODEV); + + sd = media_entity_to_v4l2_subdev(pad->entity); + + fwnode_graph_for_each_endpoint(dev_fwnode(sd->dev), endpoint) { + int pad_idx = media_entity_get_fwnode_pad(&sd->entity, + endpoint, + pad->flags); + if (pad_idx < 0) + continue; + + if (pad_idx == pad->index) + return endpoint; + } + + return ERR_PTR(-ENODEV); +} +EXPORT_SYMBOL_GPL(imx_media_get_pad_fwnode); + /* * Turn current pipeline streaming on/off starting from entity. */ diff --git a/drivers/staging/media/imx/imx-media.h b/drivers/staging/media/imx/imx-media.h index f90a65ba4ced..5f23d852122f 100644 --- a/drivers/staging/media/imx/imx-media.h +++ b/drivers/staging/media/imx/imx-media.h @@ -205,6 +205,7 @@ imx_media_pipeline_subdev(struct media_entity *start_entity, u32 grp_id, struct video_device * imx_media_pipeline_video_device(struct media_entity *start_entity, enum v4l2_buf_type buftype, bool upstream); +struct fwnode_handle *imx_media_get_pad_fwnode(struct media_pad *pad); struct imx_media_dma_buf { void *virt; diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c index 88e21c13e420..9b31379611ac 100644 --- a/drivers/staging/media/imx/imx7-media-csi.c +++ b/drivers/staging/media/imx/imx7-media-csi.c @@ -439,9 +439,8 @@ static int imx7_csi_get_upstream_endpoint(struct imx7_csi *csi, struct v4l2_fwnode_endpoint *ep, bool skip_mux) { - struct device_node *endpoint, *port; + struct fwnode_handle *endpoint; struct media_entity *src; - struct v4l2_subdev *sd; struct media_pad *pad; if (!csi->src_sd) @@ -463,29 +462,19 @@ static int imx7_csi_get_upstream_endpoint(struct imx7_csi *csi, if (!pad) return -ENODEV; - sd = media_entity_to_v4l2_subdev(pad->entity); - /* To get bus type we may need to skip video mux */ if (skip_mux && src->function == MEDIA_ENT_F_VID_MUX) { - src = &sd->entity; + src = pad->entity; goto skip_video_mux; } - /* - * NOTE: this assumes an OF-graph port id is the same as a - * media pad index. - */ - port = of_graph_get_port_by_id(sd->dev->of_node, pad->index); - if (!port) - return -ENODEV; + endpoint = imx_media_get_pad_fwnode(pad); + if (IS_ERR(endpoint)) + return PTR_ERR(endpoint); - endpoint = of_get_next_child(port, NULL); - of_node_put(port); - if (!endpoint) - return -ENODEV; + v4l2_fwnode_endpoint_parse(endpoint, ep); - v4l2_fwnode_endpoint_parse(of_fwnode_handle(endpoint), ep); - of_node_put(endpoint); + fwnode_handle_put(endpoint); return 0; }
Fix the 1:1 port-id:pad-index assumption for the upstream subdevice, by searching the upstream subdevice's endpoints for one that maps to the pad's index. This is carried out by a new reverse mapping function imx_media_get_pad_fwnode(). Signed-off-by: Steve Longerbeam <slongerbeam@gmail.com> --- drivers/staging/media/imx/imx-media-csi.c | 22 ++++---------- drivers/staging/media/imx/imx-media-utils.c | 33 +++++++++++++++++++++ drivers/staging/media/imx/imx-media.h | 1 + drivers/staging/media/imx/imx7-media-csi.c | 25 +++++----------- 4 files changed, 47 insertions(+), 34 deletions(-)