[PATCH 0/3] R-Car Gen2 support for FDP1

[PATCH 0/3] R-Car Gen2 support for FDP1

[Laurent Pinchart]

Hello,

This small patch series improves support of the FDP1 on R-Car Gen2 platforms
by enabling compilation without requiring the Gen3-only FCP dependency.

As the Kconfig change (2/3) conflicts with a patch recently posted by Geert I
have included it in the series as 1/3. Patch 3/3 fixes indentation oddities I
have run across during development.

Geert Uytterhoeven (1):
  v4l: rcar_fdp1: Change platform dependency to ARCH_RENESAS

Laurent Pinchart (2):
  v4l: rcar_fdp1: Enable compilation on Gen2 platforms
  v4l: rcar_fdp1: Fix indentation oddities

 drivers/media/platform/Kconfig     |  4 ++--
 drivers/media/platform/rcar_fdp1.c | 28 ++++++++++++++--------------
 2 files changed, 16 insertions(+), 16 deletions(-)

-- 
Regards,

Laurent Pinchart

[PATCH 1/3] v4l: rcar_fdp1: Change platform dependency to ARCH_RENESAS

[Laurent Pinchart]

From: Geert Uytterhoeven <geert+renesas@glider.be>

The Renesas Fine Display Processor driver is used on Renesas R-Car SoCs
only.  Since commit 9b5ba0df4ea4f940 ("ARM: shmobile: Introduce
ARCH_RENESAS") is ARCH_RENESAS a more appropriate platform dependency
than the legacy ARCH_SHMOBILE, hence use the former.

This will allow to drop ARCH_SHMOBILE on ARM and ARM64 in the near
future.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 drivers/media/platform/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index c7a1cf8a1b01..621d63b2001d 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -396,7 +396,7 @@ config VIDEO_SH_VEU
 config VIDEO_RENESAS_FDP1
 	tristate "Renesas Fine Display Processor"
 	depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA
-	depends on ARCH_SHMOBILE || COMPILE_TEST
+	depends on ARCH_RENESAS || COMPILE_TEST
 	depends on (!ARCH_RENESAS && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP
 	select VIDEOBUF2_DMA_CONTIG
 	select V4L2_MEM2MEM_DEV
-- 
Regards,

Laurent Pinchart

[PATCH 2/3] v4l: rcar_fdp1: Enable compilation on Gen2 platforms

[Laurent Pinchart]

Commit 1d3897143815 ("[media] v4l: rcar_fdp1: add FCP dependency") fixed
a compilation breakage when the optional VIDEO_RENESAS_FCP dependency is
compiled as a module while the rcar_fdp1 driver is built in. As a side
effect it disabled compilation on Gen2 by disallowing the valid
combination ARCH_RENESAS && !VIDEO_RENESAS_FCP. Fix it by handling the
dependency the same way the vsp1 driver did in commit 199946731fa4
("[media] vsp1: clarify FCP dependency").

Fixes: 1d3897143815 ("[media] v4l: rcar_fdp1: add FCP dependency")
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 drivers/media/platform/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 621d63b2001d..81c3ab95c050 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -397,7 +397,7 @@ config VIDEO_RENESAS_FDP1
 	tristate "Renesas Fine Display Processor"
 	depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA
 	depends on ARCH_RENESAS || COMPILE_TEST
-	depends on (!ARCH_RENESAS && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP
+	depends on (!ARM64 && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP
 	select VIDEOBUF2_DMA_CONTIG
 	select V4L2_MEM2MEM_DEV
 	---help---
-- 
Regards,

Laurent Pinchart

[PATCH 3/3] v4l: rcar_fdp1: Fix indentation oddities

[Laurent Pinchart]

Indentation is odd in several places, especially when printing messages
to the kernel log. Fix it to match the usual coding style.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 drivers/media/platform/rcar_fdp1.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/drivers/media/platform/rcar_fdp1.c b/drivers/media/platform/rcar_fdp1.c
index b13dec3081e5..81e8a761b924 100644
--- a/drivers/media/platform/rcar_fdp1.c
+++ b/drivers/media/platform/rcar_fdp1.c
@@ -949,7 +949,7 @@ static void fdp1_configure_wpf(struct fdp1_ctx *ctx,
 	u32 rndctl;
 
 	pstride = q_data->format.plane_fmt[0].bytesperline
-			<< FD1_WPF_PSTRIDE_Y_SHIFT;
+		<< FD1_WPF_PSTRIDE_Y_SHIFT;
 
 	if (q_data->format.num_planes > 1)
 		pstride |= q_data->format.plane_fmt[1].bytesperline
@@ -1143,8 +1143,8 @@ static int fdp1_m2m_job_ready(void *priv)
 	int dstbufs = 1;
 
 	dprintk(ctx->fdp1, "+ Src: %d : Dst: %d\n",
-			v4l2_m2m_num_src_bufs_ready(ctx->fh.m2m_ctx),
-			v4l2_m2m_num_dst_bufs_ready(ctx->fh.m2m_ctx));
+		v4l2_m2m_num_src_bufs_ready(ctx->fh.m2m_ctx),
+		v4l2_m2m_num_dst_bufs_ready(ctx->fh.m2m_ctx));
 
 	/* One output buffer is required for each field */
 	if (V4L2_FIELD_HAS_BOTH(src_q_data->format.field))
@@ -1282,7 +1282,7 @@ static void fdp1_m2m_device_run(void *priv)
 
 		fdp1_queue_field(ctx, fbuf);
 		dprintk(fdp1, "Queued Buffer [%d] last_field:%d\n",
-				i, fbuf->last_field);
+			i, fbuf->last_field);
 	}
 
 	/* Queue as many jobs as our data provides for */
@@ -1341,7 +1341,7 @@ static void device_frame_end(struct fdp1_dev *fdp1,
 	fdp1_job_free(fdp1, job);
 
 	dprintk(fdp1, "curr_ctx->num_processed %d curr_ctx->translen %d\n",
-			ctx->num_processed, ctx->translen);
+		ctx->num_processed, ctx->translen);
 
 	if (ctx->num_processed == ctx->translen ||
 			ctx->aborting) {
@@ -1366,7 +1366,7 @@ static int fdp1_vidioc_querycap(struct file *file, void *priv,
 	strlcpy(cap->driver, DRIVER_NAME, sizeof(cap->driver));
 	strlcpy(cap->card, DRIVER_NAME, sizeof(cap->card));
 	snprintf(cap->bus_info, sizeof(cap->bus_info),
-			"platform:%s", DRIVER_NAME);
+		 "platform:%s", DRIVER_NAME);
 	return 0;
 }
 
@@ -1997,13 +1997,13 @@ static void fdp1_stop_streaming(struct vb2_queue *q)
 		/* Free smsk_data */
 		if (ctx->smsk_cpu) {
 			dma_free_coherent(ctx->fdp1->dev, ctx->smsk_size,
-					ctx->smsk_cpu, ctx->smsk_addr[0]);
+					  ctx->smsk_cpu, ctx->smsk_addr[0]);
 			ctx->smsk_addr[0] = ctx->smsk_addr[1] = 0;
 			ctx->smsk_cpu = NULL;
 		}
 
 		WARN(!list_empty(&ctx->fields_queue),
-				"Buffer queue not empty");
+		     "Buffer queue not empty");
 	} else {
 		/* Empty Capture queues (Jobs) */
 		struct fdp1_job *job;
@@ -2025,10 +2025,10 @@ static void fdp1_stop_streaming(struct vb2_queue *q)
 		fdp1_field_complete(ctx, ctx->previous);
 
 		WARN(!list_empty(&ctx->fdp1->queued_job_list),
-				"Queued Job List not empty");
+		     "Queued Job List not empty");
 
 		WARN(!list_empty(&ctx->fdp1->hw_job_list),
-				"HW Job list not empty");
+		     "HW Job list not empty");
 	}
 }
 
@@ -2114,7 +2114,7 @@ static int fdp1_open(struct file *file)
 				     fdp1_ctrl_deint_menu);
 
 	ctrl = v4l2_ctrl_new_std(&ctx->hdl, &fdp1_ctrl_ops,
-			V4L2_CID_MIN_BUFFERS_FOR_CAPTURE, 1, 2, 1, 1);
+				 V4L2_CID_MIN_BUFFERS_FOR_CAPTURE, 1, 2, 1, 1);
 	if (ctrl)
 		ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE;
 
@@ -2351,8 +2351,8 @@ static int fdp1_probe(struct platform_device *pdev)
 		goto release_m2m;
 	}
 
-	v4l2_info(&fdp1->v4l2_dev,
-			"Device registered as /dev/video%d\n", vfd->num);
+	v4l2_info(&fdp1->v4l2_dev, "Device registered as /dev/video%d\n",
+		  vfd->num);
 
 	/* Power up the cells to read HW */
 	pm_runtime_enable(&pdev->dev);
@@ -2371,7 +2371,7 @@ static int fdp1_probe(struct platform_device *pdev)
 		break;
 	default:
 		dev_err(fdp1->dev, "FDP1 Unidentifiable (0x%08x)\n",
-				hw_version);
+			hw_version);
 	}
 
 	/* Allow the hw to sleep until an open call puts it to use */
-- 
Regards,

Laurent Pinchart

Re: [PATCH 2/3] v4l: rcar_fdp1: Enable compilation on Gen2 platforms

[Geert Uytterhoeven]

Hi Laurent,

On Sun, Apr 22, 2018 at 12:28 PM, Laurent Pinchart
<laurent.pinchart+renesas@ideasonboard.com> wrote:
> Commit 1d3897143815 ("[media] v4l: rcar_fdp1: add FCP dependency") fixed
> a compilation breakage when the optional VIDEO_RENESAS_FCP dependency is
> compiled as a module while the rcar_fdp1 driver is built in. As a side
> effect it disabled compilation on Gen2 by disallowing the valid
> combination ARCH_RENESAS && !VIDEO_RENESAS_FCP. Fix it by handling the
> dependency the same way the vsp1 driver did in commit 199946731fa4
> ("[media] vsp1: clarify FCP dependency").
>
> Fixes: 1d3897143815 ("[media] v4l: rcar_fdp1: add FCP dependency")
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> ---
>  drivers/media/platform/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
> index 621d63b2001d..81c3ab95c050 100644
> --- a/drivers/media/platform/Kconfig
> +++ b/drivers/media/platform/Kconfig
> @@ -397,7 +397,7 @@ config VIDEO_RENESAS_FDP1
>         tristate "Renesas Fine Display Processor"
>         depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA
>         depends on ARCH_RENESAS || COMPILE_TEST
> -       depends on (!ARCH_RENESAS && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP
> +       depends on (!ARM64 && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP

s/!ARM64/ARCH_RCAR_GEN2/?

>         select VIDEOBUF2_DMA_CONTIG
>         select V4L2_MEM2MEM_DEV

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH 2/3] v4l: rcar_fdp1: Enable compilation on Gen2 platforms

[Laurent Pinchart]

Hi Geert,

On Monday, 23 April 2018 10:58:13 EEST Geert Uytterhoeven wrote:
> On Sun, Apr 22, 2018 at 12:28 PM, Laurent Pinchart wrote:
> > Commit 1d3897143815 ("[media] v4l: rcar_fdp1: add FCP dependency") fixed
> > a compilation breakage when the optional VIDEO_RENESAS_FCP dependency is
> > compiled as a module while the rcar_fdp1 driver is built in. As a side
> > effect it disabled compilation on Gen2 by disallowing the valid
> > combination ARCH_RENESAS && !VIDEO_RENESAS_FCP. Fix it by handling the
> > dependency the same way the vsp1 driver did in commit 199946731fa4
> > ("[media] vsp1: clarify FCP dependency").
> > 
> > Fixes: 1d3897143815 ("[media] v4l: rcar_fdp1: add FCP dependency")
> > Signed-off-by: Laurent Pinchart
> > <laurent.pinchart+renesas@ideasonboard.com>
> > ---
> > 
> >  drivers/media/platform/Kconfig | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/media/platform/Kconfig
> > b/drivers/media/platform/Kconfig index 621d63b2001d..81c3ab95c050 100644
> > --- a/drivers/media/platform/Kconfig
> > +++ b/drivers/media/platform/Kconfig
> > @@ -397,7 +397,7 @@ config VIDEO_RENESAS_FDP1
> >         tristate "Renesas Fine Display Processor"
> >         depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA
> >         depends on ARCH_RENESAS || COMPILE_TEST
> > -       depends on (!ARCH_RENESAS && !VIDEO_RENESAS_FCP) ||
> > VIDEO_RENESAS_FCP
> > +       depends on (!ARM64 && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP
> 
> s/!ARM64/ARCH_RCAR_GEN2/?

That would work too, but is it any better ? It would only matter is 
COMPILE_TEST is set, and thus won't really make a difference.

> >         select VIDEOBUF2_DMA_CONTIG
> >         select V4L2_MEM2MEM_DEV

-- 
Regards,

Laurent Pinchart

Re: [PATCH 3/3] v4l: rcar_fdp1: Fix indentation oddities

[Kieran Bingham]

[-- Attachment #1.1: Type: text/plain, Size: 4512 bytes --]

Hi Laurent,

Thanks for the fixes.

On 22/04/18 11:28, Laurent Pinchart wrote:
> Indentation is odd in several places, especially when printing messages
> to the kernel log. Fix it to match the usual coding style.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>

> ---
>  drivers/media/platform/rcar_fdp1.c | 28 ++++++++++++++--------------
>  1 file changed, 14 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/media/platform/rcar_fdp1.c b/drivers/media/platform/rcar_fdp1.c
> index b13dec3081e5..81e8a761b924 100644
> --- a/drivers/media/platform/rcar_fdp1.c
> +++ b/drivers/media/platform/rcar_fdp1.c
> @@ -949,7 +949,7 @@ static void fdp1_configure_wpf(struct fdp1_ctx *ctx,
>  	u32 rndctl;
>  
>  	pstride = q_data->format.plane_fmt[0].bytesperline
> -			<< FD1_WPF_PSTRIDE_Y_SHIFT;
> +		<< FD1_WPF_PSTRIDE_Y_SHIFT;
>  
>  	if (q_data->format.num_planes > 1)
>  		pstride |= q_data->format.plane_fmt[1].bytesperline
> @@ -1143,8 +1143,8 @@ static int fdp1_m2m_job_ready(void *priv)
>  	int dstbufs = 1;
>  
>  	dprintk(ctx->fdp1, "+ Src: %d : Dst: %d\n",
> -			v4l2_m2m_num_src_bufs_ready(ctx->fh.m2m_ctx),
> -			v4l2_m2m_num_dst_bufs_ready(ctx->fh.m2m_ctx));
> +		v4l2_m2m_num_src_bufs_ready(ctx->fh.m2m_ctx),
> +		v4l2_m2m_num_dst_bufs_ready(ctx->fh.m2m_ctx));
>  
>  	/* One output buffer is required for each field */
>  	if (V4L2_FIELD_HAS_BOTH(src_q_data->format.field))
> @@ -1282,7 +1282,7 @@ static void fdp1_m2m_device_run(void *priv)
>  
>  		fdp1_queue_field(ctx, fbuf);
>  		dprintk(fdp1, "Queued Buffer [%d] last_field:%d\n",
> -				i, fbuf->last_field);
> +			i, fbuf->last_field);
>  	}
>  
>  	/* Queue as many jobs as our data provides for */
> @@ -1341,7 +1341,7 @@ static void device_frame_end(struct fdp1_dev *fdp1,
>  	fdp1_job_free(fdp1, job);
>  
>  	dprintk(fdp1, "curr_ctx->num_processed %d curr_ctx->translen %d\n",
> -			ctx->num_processed, ctx->translen);
> +		ctx->num_processed, ctx->translen);
>  
>  	if (ctx->num_processed == ctx->translen ||
>  			ctx->aborting) {
> @@ -1366,7 +1366,7 @@ static int fdp1_vidioc_querycap(struct file *file, void *priv,
>  	strlcpy(cap->driver, DRIVER_NAME, sizeof(cap->driver));
>  	strlcpy(cap->card, DRIVER_NAME, sizeof(cap->card));
>  	snprintf(cap->bus_info, sizeof(cap->bus_info),
> -			"platform:%s", DRIVER_NAME);
> +		 "platform:%s", DRIVER_NAME);
>  	return 0;
>  }
>  
> @@ -1997,13 +1997,13 @@ static void fdp1_stop_streaming(struct vb2_queue *q)
>  		/* Free smsk_data */
>  		if (ctx->smsk_cpu) {
>  			dma_free_coherent(ctx->fdp1->dev, ctx->smsk_size,
> -					ctx->smsk_cpu, ctx->smsk_addr[0]);
> +					  ctx->smsk_cpu, ctx->smsk_addr[0]);
>  			ctx->smsk_addr[0] = ctx->smsk_addr[1] = 0;
>  			ctx->smsk_cpu = NULL;
>  		}
>  
>  		WARN(!list_empty(&ctx->fields_queue),
> -				"Buffer queue not empty");
> +		     "Buffer queue not empty");
>  	} else {
>  		/* Empty Capture queues (Jobs) */
>  		struct fdp1_job *job;
> @@ -2025,10 +2025,10 @@ static void fdp1_stop_streaming(struct vb2_queue *q)
>  		fdp1_field_complete(ctx, ctx->previous);
>  
>  		WARN(!list_empty(&ctx->fdp1->queued_job_list),
> -				"Queued Job List not empty");
> +		     "Queued Job List not empty");
>  
>  		WARN(!list_empty(&ctx->fdp1->hw_job_list),
> -				"HW Job list not empty");
> +		     "HW Job list not empty");
>  	}
>  }
>  
> @@ -2114,7 +2114,7 @@ static int fdp1_open(struct file *file)
>  				     fdp1_ctrl_deint_menu);
>  
>  	ctrl = v4l2_ctrl_new_std(&ctx->hdl, &fdp1_ctrl_ops,
> -			V4L2_CID_MIN_BUFFERS_FOR_CAPTURE, 1, 2, 1, 1);
> +				 V4L2_CID_MIN_BUFFERS_FOR_CAPTURE, 1, 2, 1, 1);
>  	if (ctrl)
>  		ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE;
>  
> @@ -2351,8 +2351,8 @@ static int fdp1_probe(struct platform_device *pdev)
>  		goto release_m2m;
>  	}
>  
> -	v4l2_info(&fdp1->v4l2_dev,
> -			"Device registered as /dev/video%d\n", vfd->num);
> +	v4l2_info(&fdp1->v4l2_dev, "Device registered as /dev/video%d\n",
> +		  vfd->num);
>  
>  	/* Power up the cells to read HW */
>  	pm_runtime_enable(&pdev->dev);
> @@ -2371,7 +2371,7 @@ static int fdp1_probe(struct platform_device *pdev)
>  		break;
>  	default:
>  		dev_err(fdp1->dev, "FDP1 Unidentifiable (0x%08x)\n",
> -				hw_version);
> +			hw_version);
>  	}
>  
>  	/* Allow the hw to sleep until an open call puts it to use */
> 


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]