Miscellaneous small things
Sakari Ailus
maintainerv3 cover Miscellaneous small things
Hi folks,
This set does three things: refactor link creation in ipu3-cio2 driver by using v4l2_fwnode_create_links_for_pad(), add debug prints in v4l2_fwnode_create_links_for_pad() and drop an unneeded debug print in media_release().
since v2:
- Specify that the pad not found in v4l2_create_fwnode_links_to_pad() was a source pad.
since v1:
- Drop mistakenly added Prabhakar's Tested-by:.
- Print entity names and pad numbers for links that already exist in v4l2_create_fwnode_links_to_pad().
- Use "was" instead of "is" when comparing pad indices.
Sakari Ailus (3):
media: ipu3-cio2: Further clean up async subdev link creation
media: v4l2-mc: Add debug prints for
v4l2_fwnode_create_links_for_pad()
media: mc: Drop useless debug print on file handle release
drivers/media/mc/mc-devnode.c | 1 - drivers/media/pci/intel/ipu3/ipu3-cio2.c | 22 +++++----------------- drivers/media/v4l2-core/v4l2-mc.c | 23 +++++++++++++++++++---- 3 files changed, 24 insertions(+), 22 deletions(-)
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v3 1/3 media: ipu3-cio2: Further clean up async subdev link creation
Use v4l2_create_fwnode_links_to_pad() to create links from async sub-devices to the CSI-2 receiver subdevs.
--- drivers/media/pci/intel/ipu3/ipu3-cio2.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-)
drivers/media/pci/intel/ipu3/ipu3-cio2.c +5 -17
@@ -28,6 +28,7 @@#include <media/v4l2-device.h> #include <media/v4l2-event.h> #include <media/v4l2-fwnode.h> +#include <media/v4l2-mc.h> #include <media/v4l2-ioctl.h> #include <media/videobuf2-dma-sg.h>
@@ -1407,7 +1408,6 @@ static void cio2_notifier_unbind(struct v4l2_async_notifier *notifier,static int cio2_notifier_complete (struct v4l2_async_notifier *notifier) {struct cio2_device *cio2 =to_cio2_device (notifier); -struct device *dev = &cio2->pci_dev->dev;struct sensor_async_subdev *s_asd;struct v4l2_async_connection *asd;struct cio2_queue *q;
@@ -1417,23 +1417,10 @@ static int cio2_notifier_complete(struct v4l2_async_notifier *notifier) s_asd =to_sensor_asd (asd); q = &cio2->queue[s_asd->csi2.port]; - ret =media_entity_get_fwnode_pad (&q->sensor->entity, - s_asd->asd.match.fwnode, -MEDIA_PAD_FL_SOURCE ); -if (ret <0 ) { -dev_err (dev,"no pad for endpoint %pfw (%d)\n" , - s_asd->asd.match.fwnode, ret); -return ret; - } - - ret =media_create_pad_link (&q->sensor->entity, ret, - &q->subdev.entity,CIO2_PAD_SINK , -0 ); -if (ret) { -dev_err (dev,"failed to create link for %s (endpoint %pfw, error %d)\n" , - q->sensor->name, s_asd->asd.match.fwnode, ret); + ret =v4l2_create_fwnode_links_to_pad (asd->sd, + &q->subdev_pads[CIO2_PAD_SINK ],0 ); +if (ret)return ret; - } }return v4l2_device_register_subdev_nodes (&cio2->v4l2_dev);
@@ -1572,6 +1559,7 @@ static int cio2_queue_init(struct cio2_device *cio2, struct cio2_queue *q)v4l2_subdev_init (subdev, &cio2_subdev_ops); subdev->flags =V4L2_SUBDEV_FL_HAS_DEVNODE |V4L2_SUBDEV_FL_HAS_EVENTS ; subdev->owner =THIS_MODULE ; + subdev->dev = dev;snprintf (subdev->name,sizeof (subdev->name),CIO2_ENTITY_NAME " %td" , q - cio2->queue); subdev->entity.function =MEDIA_ENT_F_VID_IF_BRIDGE ;
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v3 2/3 media: v4l2-mc: Add debug prints for v4l2_fwnode_create_links_for_pad()
In reply to Sakari AilusAdd relevant debug prints for v4l2_fwnode_create_links_for_pad(). This should help debugging when things go wrong.
--- drivers/media/v4l2-core/v4l2-mc.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-)
drivers/media/v4l2-core/v4l2-mc.c +19 -4
@@ -337,12 +337,18 @@ int v4l2_create_fwnode_links_to_pad(struct v4l2_subdev *src_sd, src_idx =media_entity_get_fwnode_pad (&src_sd->entity, endpoint,MEDIA_PAD_FL_SOURCE ); -if (src_idx <0 ) +if (src_idx <0 ) { +dev_dbg (src_sd->dev,"no source pad found for %pfw\n" , + endpoint);continue ; + } remote_ep =fwnode_graph_get_remote_endpoint (endpoint); -if (!remote_ep) +if (!remote_ep) { +dev_dbg (src_sd->dev,"no remote ep found for %pfw\n" , + endpoint);continue ; + }/* * ask the sink to verify it owns the remote endpoint,
@@ -353,8 +359,12 @@ int v4l2_create_fwnode_links_to_pad(struct v4l2_subdev *src_sd, MEDIA_PAD_FL_SINK);fwnode_handle_put (remote_ep); -if (sink_idx <0 || sink_idx != sink->index) +if (sink_idx <0 || sink_idx != sink->index) { +dev_dbg (src_sd->dev, +"sink pad index mismatch or error (is %d, expected %u)\n" , + sink_idx, sink->index);continue ; + }/* * the source endpoint corresponds to one of its source pads,
@@ -367,8 +377,13 @@ int v4l2_create_fwnode_links_to_pad(struct v4l2_subdev *src_sd, src = &src_sd->entity.pads[src_idx];/* skip if link already exists */ -if (media_entity_find_link (src, sink)) +if (media_entity_find_link (src, sink)) { +dev_dbg (src_sd->dev, +"link %s:%d -> %s:%d already exists\n" , + src_sd->entity.name, src_idx, + sink->entity->name, sink_idx);continue ; + } dev_dbg(src_sd->dev, "creating link %s:%d -> %s:%d\n", src_sd->entity.name, src_idx,
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH v3 3/3 media: mc: Drop useless debug print on file handle release
In reply to Sakari AilusDrop a debug print in media_release(), which is a release callback for a file handle. Printing a debug message here is simply not necessary.
--- drivers/media/mc/mc-devnode.c | 1 - 1 file changed, 1 deletion(-)
drivers/media/mc/mc-devnode.c +0 -1
@@ -190,7 +190,6 @@ static int media_release(struct inode *inode, struct file *filp)return value is ignored. */ put_device (&devnode->dev); -pr_debug ("%s: Media Release\n" , __func__);return 0 ; }
Signature · 1 line
2.39.2