mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-07 12:44:32 -04:00
media: imx: Create missing links from CSI-2 receiver
The entities external to the i.MX6 IPU and i.MX7 now create the links to their fwnode-endpoint connected entities in their notifier bound callbacks. Which means imx_media_create_of_links() and imx_media_create_csi_of_links() are no longer needed and are removed. However there is still one case in which imx-media needs to create fwnode-endpoint based links at probe completion. The v4l2-async framework does not allow multiple subdevice notifiers to contain a duplicate subdevice in their asd_list. Only the first subdev notifier that discovers and adds that one subdevice to its asd_list will receive a bound callback for it. Other subdevices that also have firmware endpoint connections to this duplicate subdevice will not have it in their asd_list, and thus will never receive a bound callback for it. In the case of imx-media, the one duplicate subdevice in question is the i.MX6 MIPI CSI-2 receiver. Until there is a solution to that problem, rewrite imx_media_create_links() to add the missing links from the CSI-2 receiver to the CSIs and CSI muxes. The function is renamed imx_media_create_csi2_links(). Signed-off-by: Steve Longerbeam <slongerbeam@gmail.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Steve Longerbeam
committed by
Mauro Carvalho Chehab
Mauro Carvalho Chehab
parent
f02eac790d
commit
f0c1210f8a
@@ -30,41 +30,31 @@ static int imx_media_subdev_bound(struct v4l2_async_notifier *notifier,
|
||||
}
|
||||
|
||||
/*
|
||||
* Create the media links for all subdevs that registered.
|
||||
* Create the missing media links from the CSI-2 receiver.
|
||||
* Called after all async subdevs have bound.
|
||||
*/
|
||||
static int imx_media_create_links(struct v4l2_async_notifier *notifier)
|
||||
static void imx_media_create_csi2_links(struct imx_media_dev *imxmd)
|
||||
{
|
||||
struct imx_media_dev *imxmd = notifier2dev(notifier);
|
||||
struct v4l2_subdev *sd;
|
||||
struct v4l2_subdev *sd, *csi2 = NULL;
|
||||
|
||||
list_for_each_entry(sd, &imxmd->v4l2_dev.subdevs, list) {
|
||||
switch (sd->grp_id) {
|
||||
case IMX_MEDIA_GRP_ID_IPU_VDIC:
|
||||
case IMX_MEDIA_GRP_ID_IPU_IC_PRP:
|
||||
case IMX_MEDIA_GRP_ID_IPU_IC_PRPENC:
|
||||
case IMX_MEDIA_GRP_ID_IPU_IC_PRPVF:
|
||||
/*
|
||||
* links have already been created for the
|
||||
* sync-registered subdevs.
|
||||
*/
|
||||
break;
|
||||
case IMX_MEDIA_GRP_ID_IPU_CSI0:
|
||||
case IMX_MEDIA_GRP_ID_IPU_CSI1:
|
||||
case IMX_MEDIA_GRP_ID_CSI:
|
||||
imx_media_create_csi_of_links(imxmd, sd);
|
||||
break;
|
||||
default:
|
||||
/*
|
||||
* if this subdev has fwnode links, create media
|
||||
* links for them.
|
||||
*/
|
||||
imx_media_create_of_links(imxmd, sd);
|
||||
if (sd->grp_id == IMX_MEDIA_GRP_ID_CSI2) {
|
||||
csi2 = sd;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!csi2)
|
||||
return;
|
||||
|
||||
return 0;
|
||||
list_for_each_entry(sd, &imxmd->v4l2_dev.subdevs, list) {
|
||||
/* skip if not a CSI or a CSI mux */
|
||||
if (!(sd->grp_id & IMX_MEDIA_GRP_ID_IPU_CSI) &&
|
||||
!(sd->grp_id & IMX_MEDIA_GRP_ID_CSI) &&
|
||||
!(sd->grp_id & IMX_MEDIA_GRP_ID_CSI_MUX))
|
||||
continue;
|
||||
|
||||
v4l2_create_fwnode_links(csi2, sd);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -196,9 +186,7 @@ int imx_media_probe_complete(struct v4l2_async_notifier *notifier)
|
||||
|
||||
mutex_lock(&imxmd->mutex);
|
||||
|
||||
ret = imx_media_create_links(notifier);
|
||||
if (ret)
|
||||
goto unlock;
|
||||
imx_media_create_csi2_links(imxmd);
|
||||
|
||||
ret = imx_media_create_pad_vdev_lists(imxmd);
|
||||
if (ret)
|
||||
|
||||
@@ -74,117 +74,3 @@ int imx_media_add_of_subdevs(struct imx_media_dev *imxmd,
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(imx_media_add_of_subdevs);
|
||||
|
||||
/*
|
||||
* Create a single media link to/from sd using a fwnode link.
|
||||
*
|
||||
* NOTE: this function assumes an OF port node is equivalent to
|
||||
* a media pad (port id equal to media pad index), and that an
|
||||
* OF endpoint node is equivalent to a media link.
|
||||
*/
|
||||
static int create_of_link(struct imx_media_dev *imxmd,
|
||||
struct v4l2_subdev *sd,
|
||||
struct v4l2_fwnode_link *link)
|
||||
{
|
||||
struct v4l2_subdev *remote, *src, *sink;
|
||||
int src_pad, sink_pad;
|
||||
|
||||
if (link->local_port >= sd->entity.num_pads)
|
||||
return -EINVAL;
|
||||
|
||||
remote = imx_media_find_subdev_by_fwnode(imxmd, link->remote_node);
|
||||
if (!remote)
|
||||
return 0;
|
||||
|
||||
if (sd->entity.pads[link->local_port].flags & MEDIA_PAD_FL_SINK) {
|
||||
src = remote;
|
||||
src_pad = link->remote_port;
|
||||
sink = sd;
|
||||
sink_pad = link->local_port;
|
||||
} else {
|
||||
src = sd;
|
||||
src_pad = link->local_port;
|
||||
sink = remote;
|
||||
sink_pad = link->remote_port;
|
||||
}
|
||||
|
||||
/* make sure link doesn't already exist before creating */
|
||||
if (media_entity_find_link(&src->entity.pads[src_pad],
|
||||
&sink->entity.pads[sink_pad]))
|
||||
return 0;
|
||||
|
||||
v4l2_info(sd->v4l2_dev, "%s:%d -> %s:%d\n",
|
||||
src->name, src_pad, sink->name, sink_pad);
|
||||
|
||||
return media_create_pad_link(&src->entity, src_pad,
|
||||
&sink->entity, sink_pad, 0);
|
||||
}
|
||||
|
||||
/*
|
||||
* Create media links to/from sd using its device-tree endpoints.
|
||||
*/
|
||||
int imx_media_create_of_links(struct imx_media_dev *imxmd,
|
||||
struct v4l2_subdev *sd)
|
||||
{
|
||||
struct v4l2_fwnode_link link;
|
||||
struct device_node *ep;
|
||||
int ret;
|
||||
|
||||
for_each_endpoint_of_node(sd->dev->of_node, ep) {
|
||||
ret = v4l2_fwnode_parse_link(of_fwnode_handle(ep), &link);
|
||||
if (ret)
|
||||
continue;
|
||||
|
||||
ret = create_of_link(imxmd, sd, &link);
|
||||
v4l2_fwnode_put_link(&link);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(imx_media_create_of_links);
|
||||
|
||||
/*
|
||||
* Create media links to the given CSI subdevice's sink pads,
|
||||
* using its device-tree endpoints.
|
||||
*/
|
||||
int imx_media_create_csi_of_links(struct imx_media_dev *imxmd,
|
||||
struct v4l2_subdev *csi)
|
||||
{
|
||||
struct device_node *csi_np = csi->dev->of_node;
|
||||
struct device_node *ep;
|
||||
|
||||
for_each_child_of_node(csi_np, ep) {
|
||||
struct fwnode_handle *fwnode, *csi_ep;
|
||||
struct v4l2_fwnode_link link;
|
||||
int ret;
|
||||
|
||||
memset(&link, 0, sizeof(link));
|
||||
|
||||
link.local_node = of_fwnode_handle(csi_np);
|
||||
link.local_port = CSI_SINK_PAD;
|
||||
|
||||
csi_ep = of_fwnode_handle(ep);
|
||||
|
||||
fwnode = fwnode_graph_get_remote_endpoint(csi_ep);
|
||||
if (!fwnode)
|
||||
continue;
|
||||
|
||||
fwnode = fwnode_get_parent(fwnode);
|
||||
fwnode_property_read_u32(fwnode, "reg", &link.remote_port);
|
||||
fwnode = fwnode_get_next_parent(fwnode);
|
||||
if (is_of_node(fwnode) &&
|
||||
of_node_name_eq(to_of_node(fwnode), "ports"))
|
||||
fwnode = fwnode_get_next_parent(fwnode);
|
||||
link.remote_node = fwnode;
|
||||
|
||||
ret = create_of_link(imxmd, csi, &link);
|
||||
fwnode_handle_put(link.remote_node);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(imx_media_create_csi_of_links);
|
||||
|
||||
@@ -263,10 +263,6 @@ void imx_media_unregister_ipu_internal_subdevs(struct imx_media_dev *imxmd);
|
||||
/* imx-media-of.c */
|
||||
int imx_media_add_of_subdevs(struct imx_media_dev *dev,
|
||||
struct device_node *np);
|
||||
int imx_media_create_of_links(struct imx_media_dev *imxmd,
|
||||
struct v4l2_subdev *sd);
|
||||
int imx_media_create_csi_of_links(struct imx_media_dev *imxmd,
|
||||
struct v4l2_subdev *csi);
|
||||
int imx_media_of_add_csi(struct imx_media_dev *imxmd,
|
||||
struct device_node *csi_np);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user