[PATCH 0/2] OMAP3 ISP pipeline validation patches

[PATCH 0/2] OMAP3 ISP pipeline validation patches

[Laurent Pinchart]

Hello,

Those two patches fix the OMAP3 ISP pipeline validation when locating the
external subdevice.

The code currently works by chance with memory-to-memory pipelines, as it
tries to locate the external subdevice when none is available, but ignores the
failure due to a bug. This patch set fixes both issues.

Peter, could you check whether this fixes the warning you've reported ?

Laurent Pinchart (2):
  omap3isp: Don't try to locate external subdev for mem-to-mem pipelines
  omap3isp: Don't ignore failure to locate external subdev

 drivers/media/platform/omap3isp/ispvideo.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

-- 
Regards,

Laurent Pinchart

[PATCH 1/2] omap3isp: Don't try to locate external subdev for mem-to-mem pipelines

[Laurent Pinchart]

Memory-to-memory pipelines have no external subdev, we shouldn't try to
locate one and validate its configuration. The driver currently works by
chance due to another bug that results in failure to locate the external
subdev being ignored.

This gets rid of the "omap3isp omap3isp: can't find source, failing now"
error message in the kernel log when operating on a memory-to-memory
pipeline.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 drivers/media/platform/omap3isp/ispvideo.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c
index 856fdf5..313fd13 100644
--- a/drivers/media/platform/omap3isp/ispvideo.c
+++ b/drivers/media/platform/omap3isp/ispvideo.c
@@ -888,6 +888,10 @@ static int isp_video_check_external_subdevs(struct isp_video *video,
 	unsigned int i;
 	int ret = 0;
 
+	/* Memory-to-memory pipelines have no external subdev. */
+	if (pipe->input != NULL)
+		return 0;
+
 	for (i = 0; i < ARRAY_SIZE(ents); i++) {
 		/* Is the entity part of the pipeline? */
 		if (!(pipe->entities & (1 << ents[i]->id)))
-- 
1.8.3.2

[PATCH 2/2] omap3isp: Don't ignore failure to locate external subdev

[Laurent Pinchart]

A failure to locate the external subdev for a non memory-to-memory
pipeline is a fatal error, don't ignore it.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 drivers/media/platform/omap3isp/ispvideo.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c
index 313fd13..a62cf0b 100644
--- a/drivers/media/platform/omap3isp/ispvideo.c
+++ b/drivers/media/platform/omap3isp/ispvideo.c
@@ -886,7 +886,7 @@ static int isp_video_check_external_subdevs(struct isp_video *video,
 	struct v4l2_ext_controls ctrls;
 	struct v4l2_ext_control ctrl;
 	unsigned int i;
-	int ret = 0;
+	int ret;
 
 	/* Memory-to-memory pipelines have no external subdev. */
 	if (pipe->input != NULL)
@@ -909,7 +909,7 @@ static int isp_video_check_external_subdevs(struct isp_video *video,
 
 	if (!source) {
 		dev_warn(isp->dev, "can't find source, failing now\n");
-		return ret;
+		return -EINVAL;
 	}
 
 	if (media_entity_type(source) != MEDIA_ENT_T_V4L2_SUBDEV)
-- 
1.8.3.2

Re: [PATCH 0/2] OMAP3 ISP pipeline validation patches

[Sakari Ailus]

Laurent Pinchart wrote:
> Hello,
> 
> Those two patches fix the OMAP3 ISP pipeline validation when locating the
> external subdevice.
> 
> The code currently works by chance with memory-to-memory pipelines, as it
> tries to locate the external subdevice when none is available, but ignores the
> failure due to a bug. This patch set fixes both issues.
> 
> Peter, could you check whether this fixes the warning you've reported ?
> 
> Laurent Pinchart (2):
>   omap3isp: Don't try to locate external subdev for mem-to-mem pipelines
>   omap3isp: Don't ignore failure to locate external subdev

To both:

Acked-by: Sakari Ailus <sakari.ailus@iki.fi>

-- 
Sakari Ailus
sakari.ailus@iki.fi

Re: [PATCH 0/2] OMAP3 ISP pipeline validation patches

[Peter Meerwald]

> > Those two patches fix the OMAP3 ISP pipeline validation when locating the
> > external subdevice.
> > 
> > The code currently works by chance with memory-to-memory pipelines, as it
> > tries to locate the external subdevice when none is available, but ignores the
> > failure due to a bug. This patch set fixes both issues.
> > 
> > Peter, could you check whether this fixes the warning you've reported ?
> > 
> > Laurent Pinchart (2):
> >   omap3isp: Don't try to locate external subdev for mem-to-mem pipelines
> >   omap3isp: Don't ignore failure to locate external subdev
> 
> To both:
> Acked-by: Sakari Ailus <sakari.ailus@iki.fi>

both
Tested-by: Peter Meerwald <pmeerw@pmeerw.net>

thanks, p.

-- 

Peter Meerwald
+43-664-2444418 (mobile)