[PATCH RFC 0/2] v4l: platform: Add Renesas R-Car FDP1 Driver

[PATCH RFC 0/2] v4l: platform: Add Renesas R-Car FDP1 Driver

[Kieran Bingham]

This early version of the driver, is submitted for review, and functions only
as a pixel format converter.

The FDP1, (Fine Display Processor) is a de-interlacer device, with capability
to convert from various YCbCr/YUV formats to both YCbCr/YUV and RGB formats
at the same time as converting interlaced content to progressive.

It can also function with progressive frames on input, and still act as a
pixel converter which is the current state of the driver.

The next phase of work will be to implement the de-interlacing fucntionality
on top of this code base, however as it is now a functional driver this seemed
like an apt point to start the review process.

Kieran Bingham (2):
  v4l: platform: Add Renesas R-Car FDP1 Driver
  MAINTAINERS: Add support for FDP driver

 MAINTAINERS                        |    9 +
 drivers/media/platform/Kconfig     |   13 +
 drivers/media/platform/Makefile    |    1 +
 drivers/media/platform/rcar_fdp1.c | 2038 ++++++++++++++++++++++++++++++++++++
 4 files changed, 2061 insertions(+)
 create mode 100644 drivers/media/platform/rcar_fdp1.c

-- 
2.7.4

[PATCH RFC 1/2] v4l: platform: Add Renesas R-Car FDP1 Driver

[Kieran Bingham]

The FDP1 driver performs advanced de-interlacing on a memory 2 memory
based video stream, and supports conversion from YCbCr/YUV
to RGB pixel formats

Signed-off-by: Kieran Bingham <kieran@bingham.xyz>
---
 drivers/media/platform/Kconfig     |   13 +
 drivers/media/platform/Makefile    |    1 +
 drivers/media/platform/rcar_fdp1.c | 2038 ++++++++++++++++++++++++++++++++++++
 3 files changed, 2052 insertions(+)
 create mode 100644 drivers/media/platform/rcar_fdp1.c

diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 84e041c0a70e..9c745e53909b 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -235,6 +235,19 @@ config VIDEO_SH_VEU
 	    Support for the Video Engine Unit (VEU) on SuperH and
 	    SH-Mobile SoCs.
 
+config VIDEO_RENESAS_FDP1
+	tristate "Renesas Fine Display Processor"
+	depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA
+	#	depends on ARCH_SHMOBILE || COMPILE_TEST
+	select VIDEOBUF2_DMA_CONTIG
+	select V4L2_MEM2MEM_DEV
+	---help---
+	  This is a V4L2 driver for the Renesas Fine Display Processor
+	  providing colour space conversion, and de-interlacing features.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called rcar_fdp1.
+
 config VIDEO_RENESAS_JPU
 	tristate "Renesas JPEG Processing Unit"
 	depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index bbb7bd1eb268..907ed6473718 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -46,6 +46,7 @@ obj-$(CONFIG_VIDEO_SH_VOU)		+= sh_vou.o
 
 obj-$(CONFIG_SOC_CAMERA)		+= soc_camera/
 
+obj-$(CONFIG_VIDEO_RENESAS_FDP1)	+= rcar_fdp1.o
 obj-$(CONFIG_VIDEO_RENESAS_JPU) 	+= rcar_jpu.o
 obj-$(CONFIG_VIDEO_RENESAS_VSP1)	+= vsp1/
 
diff --git a/drivers/media/platform/rcar_fdp1.c b/drivers/media/platform/rcar_fdp1.c
new file mode 100644
index 000000000000..82078367fa14
--- /dev/null
+++ b/drivers/media/platform/rcar_fdp1.c
@@ -0,0 +1,2038 @@
+/*
+ * Renesas RCar Fine Display Processor
+ *
+ * Video format converter and frame deinterlacer device.
+ *
+ * Author: Kieran Bingham, <kieran@bingham.xyz>
+ * Copyright (c) 2016 Renesas Electronics Corporation.
+ *
+ * This code is developed and inspired from the vim2m, rcar_jpu,
+ * m2m-deinterlace, and vsp1 drivers.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version
+ */
+
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/clk.h>
+#include <linux/fs.h>
+#include <linux/timer.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+#include <media/v4l2-mem2mem.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-ioctl.h>
+#include <media/v4l2-ctrls.h>
+#include <media/v4l2-event.h>
+#include <media/videobuf2-dma-contig.h>
+#include <media/rcar-fcp.h>
+
+#include <linux/debugfs.h>
+
+static unsigned int debug;
+module_param(debug, uint, 0644);
+MODULE_PARM_DESC(debug, "activate debug info");
+
+/* Min Width/Height/Height-Field */
+#define MIN_W 80U
+#define MIN_H 80U
+
+#define MAX_W 3840U
+#define MAX_H 2160U
+
+/* Flags that indicate a format can be used for capture/output */
+#define FDP1_CAPTURE	(1 << 0)
+#define FDP1_OUTPUT	(1 << 1)
+
+#define DRIVER_NAME		"rcar_fdp1"
+
+#define dprintk(dev, fmt, arg...) \
+	v4l2_dbg(1, debug, &dev->v4l2_dev, "%s: " fmt, __func__, ## arg)
+
+/*
+ * FDP1 registers and bits
+ */
+
+/* FDP1 start register - Imm */
+#define CTL_CMD			0x0000
+#define CTL_CMD_STRCMD		BIT(0)
+
+/* Sync generator register - Imm */
+#define CTL_SGCMD		0x0004
+#define CTL_SGCMD_SGEN		BIT(0)
+
+/* Register set end register - Imm */
+#define CTL_REGEND		0x0008
+#define CTL_REGEND_REGEND	BIT(0)
+
+/* Channel activation register - Vupdt */
+#define CTL_CHACT		0x000C
+#define CTL_CHACT_SMW		BIT(9)
+#define CTL_CHACT_WR		BIT(8)
+#define CTL_CHACT_SMR		BIT(3)
+#define CTL_CHACT_RD2		BIT(2)
+#define CTL_CHACT_RD1		BIT(1)
+#define CTL_CHACT_RD0		BIT(0)
+
+/* Operation Mode Register - Vupdt */
+#define CTL_OPMODE		0x0010
+#define CTL_OPMODE_PRG		BIT(4)
+#define CTL_OPMODE_VIMD		GENMASK(1, 0)
+#define CTL_OPMODE_INTERRUPT	0
+#define CTL_OPMODE_BEST_EFFORT	1
+#define CTL_OPMODE_NO_INTERRUPT	2
+
+#define CTL_VPERIOD		0x0014
+#define CTL_CLKCTRL		0x0018
+#define CTL_CLKCTRL_CSTP_N	BIT(0)
+
+/* Software reset register */
+#define CTL_SRESET		0x001C
+#define CTL_SRESET_SRST		BIT(0)
+
+/* Control status register (V-update-status) */
+#define CTL_STATUS		0x0024
+#define CTL_STATUS_VINT_CNT(x)	((x & 0xff) >> 16)
+#define CTL_STATUS_SGREGSET	BIT(10)
+#define CTL_STATUS_SGVERR	BIT(9)
+#define CTL_STATUS_SGFREND	BIT(8)
+#define CTL_STATUS_BSY		BIT(0)
+
+#define CTL_VCYCLE_STATUS	0x0028
+
+/* Interrupt enable register */
+#define CTL_IRQENB		0x0038
+/* Interrupt status register */
+#define CTL_IRQSTA		0x003C
+/* Interrupt control register */
+#define CTL_IRQFSET		0x0040
+
+/* Common IRQ Bit settings */
+#define CTL_IRQ_VERE		BIT(16)
+#define CTL_IRQ_VINTE		BIT(4)
+#define CTL_IRQ_FREE		BIT(0)
+#define CTL_IRQ_MASK		(CTL_IRQ_VERE | CTL_IRQ_VINTE | CTL_IRQ_FREE)
+
+/* RPF */
+#define RPF_SIZE		0x0060
+#define RPF_SIZE_MASK		GENMASK(12, 0)
+#define RPF_SIZE_H_SHIFT	16
+#define RPF_SIZE_V_SHIFT	0
+
+#define RPF_FORMAT		0x0064
+#define RPF_FORMAT_RSPYCS	BIT(13)
+#define RPF_FORMAT_RSPUVS	BIT(12)
+#define RPF_FORMAT_CF		BIT(8)
+
+#define RPF_PSTRIDE		0x0068
+#define RPF_PSTRIDE_Y_SHIFT	16
+#define RPF_PSTRIDE_C_SHIFT	0
+
+/* RPF0 Source Component Y Address register */
+#define RPF0_ADDR_Y		0x006C
+
+/* RPF1 Current Picture Registers */
+#define RPF1_ADDR_Y		0x0078
+#define RPF1_ADDR_C0		0x007C
+#define RPF1_ADDR_C1		0x0080
+
+/* RPF2 next picture register */
+#define RPF2_ADDR_Y		0x0084
+
+#define RPF_SMSK_ADDR		0x0090
+#define RPF_SWAP		0x0094
+
+/* WPF */
+#define WPF_FORMAT		0x00C0
+#define WPF_FORMAT_PDV_SHIFT	24
+#define WPF_FORMAT_FCNL		BIT(20)
+#define WPF_FORMAT_WSPYCS	BIT(15)
+#define WPF_FORMAT_WSPUVS	BIT(14)
+#define WPF_FORMAT_WRTM_601_16	0
+#define WPF_FORMAT_WRTM_601_0	1
+#define WPF_FORMAT_WRTM_709_16	2
+#define WPF_FORMAT_WRTM_SHIFT	9
+#define WPF_FORMAT_CSC		BIT(8)
+
+#define WPF_RND_CTL		0x00C4
+#define WPF_PSTRIDE		0x00C8
+#define WPF_PSTRIDE_Y_SHIFT	16
+#define WPF_PSTRIDE_C_SHIFT	0
+
+/* WPF Destination picture */
+#define WPF_ADDR_Y		0x00CC
+#define WPF_ADDR_C0		0x00D0
+#define WPF_ADDR_C1		0x00D4
+#define WPF_SWAP		0x00D8
+#define WPF_SWAP_SSWAP_SHIFT	4
+
+/* WPF/RPF Common */
+#define RWPF_SWAP_BYTE		BIT(0)
+#define RWPF_SWAP_WORD		BIT(1)
+#define RWPF_SWAP_LWRD		BIT(2)
+#define RWPF_SWAP_LLWD		BIT(3)
+
+/* IPC */
+#define IPC_MODE		0x0100
+#define IPC_MODE_DLI		BIT(8)
+#define IPC_MODE_DIM		GENMASK(2, 0)
+#define IPC_MODE_DIM_ADAPT2D3D	0
+#define IPC_MODE_DIM_FIXED2D	1
+#define IPC_MODE_DIM_FIXED3D	2
+#define IPC_MODE_DIM_PREVFIELD	3
+#define IPC_MODE_DIM_NEXTFIELD	4
+
+#define IPC_SMSK_THRESH		0x0104
+#define IPC_SMSK_THRESH_CONST	0x00010002
+
+#define IPC_COMB_DET		0x0108
+#define IPC_COMB_DET_CONST	0x00200040
+
+#define IPC_MOTDEC		0x010C
+#define IPC_MOTDEC_CONST	0x00008020
+
+/* DLI registers */
+#define IPC_DLI_BLEND		0x0120
+#define IPC_DLI_BLEND_CONST	0x0080FF02
+
+#define IPC_DLI_HGAIN		0x0124
+#define IPC_DLI_HGAIN_CONST	0x001000FF
+
+#define IPC_DLI_SPRS		0x0128
+#define IPC_DLI_SPRS_CONST	0x009004FF
+
+#define IPC_DLI_ANGLE		0x012C
+#define IPC_DLI_ANGLE_CONST	0x0004080C
+
+#define IPC_DLI_ISOPIX0		0x0130
+#define IPC_DLI_ISOPIX0_CONST	0xFF10FF10
+
+#define IPC_DLI_ISOPIX1		0x0134
+#define IPC_DLI_ISOPIX1_CONST	0x0000FF10
+
+/* Sensor registers */
+#define IPC_SENSOR_TH0		0x0140
+#define IPC_SENSOR_TH0_CONST	0x20208080
+
+#define IPC_SENSOR_CTL0		0x0170
+#define IPC_SENSOR_CTL0_CONST	0x00002201
+
+#define IPC_SENSOR_CTL1		0x0174
+#define IPC_SENSOR_CTL1_CONST	0
+
+#define IPC_SENSOR_CTL2		0x0178
+#define IPC_SENSOR_CTL2_X_SHIFT	16
+#define IPC_SENSOR_CTL2_Y_SHIFT	0
+
+#define IPC_SENSOR_CTL3		0x017C
+#define IPC_SENSOR_CTL3_0_SHIFT	16
+#define IPC_SENSOR_CTL3_1_SHIFT	0
+
+/* Line memory pixel number register */
+#define IPC_LMEM		0x01E0
+#define IPC_LMEM_LINEAR		1024
+#define IPC_LMEM_TILE		960
+
+/* Internal Data (HW Version) */
+#define IP_INTDATA		0x0800
+#define IP_H3			0x02010101
+#define IP_M3W			0x02010202
+
+/* LUTs */
+#define LUT_DIF_ADJ		0x1000
+#define LUT_SAD_ADJ		0x1400
+#define LUT_BLD_GAIN		0x1800
+#define LUT_DIF_GAIN		0x1C00
+#define LUT_MDET		0x2000
+
+/* DebugFS Regsets */
+#define FDP1_DBFS_REG(reg) { #reg, reg }
+
+static struct debugfs_reg32 fdp1_regset[] = {
+	FDP1_DBFS_REG(CTL_CMD),
+	FDP1_DBFS_REG(CTL_SGCMD),
+	FDP1_DBFS_REG(CTL_REGEND),
+	FDP1_DBFS_REG(CTL_CHACT),
+	FDP1_DBFS_REG(CTL_OPMODE),
+	FDP1_DBFS_REG(CTL_VPERIOD),
+	FDP1_DBFS_REG(CTL_CLKCTRL),
+	FDP1_DBFS_REG(CTL_SRESET),
+	FDP1_DBFS_REG(CTL_STATUS),
+	FDP1_DBFS_REG(CTL_VCYCLE_STATUS),
+	FDP1_DBFS_REG(CTL_IRQENB),
+	FDP1_DBFS_REG(CTL_IRQSTA),
+	FDP1_DBFS_REG(CTL_IRQFSET),
+	FDP1_DBFS_REG(RPF_SIZE),
+	FDP1_DBFS_REG(RPF_FORMAT),
+	FDP1_DBFS_REG(RPF_PSTRIDE),
+	FDP1_DBFS_REG(RPF0_ADDR_Y),
+	FDP1_DBFS_REG(RPF1_ADDR_Y),
+	FDP1_DBFS_REG(RPF1_ADDR_C0),
+	FDP1_DBFS_REG(RPF1_ADDR_C1),
+	FDP1_DBFS_REG(RPF2_ADDR_Y),
+	FDP1_DBFS_REG(RPF_SMSK_ADDR),
+	FDP1_DBFS_REG(RPF_SWAP),
+	FDP1_DBFS_REG(WPF_FORMAT),
+	FDP1_DBFS_REG(WPF_RND_CTL),
+	FDP1_DBFS_REG(WPF_PSTRIDE),
+	FDP1_DBFS_REG(WPF_ADDR_Y),
+	FDP1_DBFS_REG(WPF_ADDR_C0),
+	FDP1_DBFS_REG(WPF_ADDR_C1),
+	FDP1_DBFS_REG(WPF_SWAP),
+	FDP1_DBFS_REG(IPC_MODE),
+	FDP1_DBFS_REG(IPC_SMSK_THRESH),
+	FDP1_DBFS_REG(IPC_COMB_DET),
+	FDP1_DBFS_REG(IPC_MOTDEC),
+	FDP1_DBFS_REG(IPC_DLI_BLEND),
+	FDP1_DBFS_REG(IPC_DLI_HGAIN),
+	FDP1_DBFS_REG(IPC_DLI_SPRS),
+	FDP1_DBFS_REG(IPC_DLI_ANGLE),
+	FDP1_DBFS_REG(IPC_DLI_ISOPIX0),
+	FDP1_DBFS_REG(IPC_DLI_ISOPIX1),
+	FDP1_DBFS_REG(IPC_SENSOR_TH0),
+	FDP1_DBFS_REG(IPC_SENSOR_CTL0),
+	FDP1_DBFS_REG(IPC_SENSOR_CTL1),
+	FDP1_DBFS_REG(IPC_SENSOR_CTL2),
+	FDP1_DBFS_REG(IPC_SENSOR_CTL3),
+	FDP1_DBFS_REG(IPC_LMEM),
+	FDP1_DBFS_REG(IP_INTDATA),
+};
+
+#define NUM_FDP1_REGSETS ARRAY_SIZE(fdp1_regset)
+
+
+/**
+ * struct fdp1_fmt - The FDP1 internal format data
+ * @fourcc: the fourcc code, to match the V4L2 API
+ * @bpp: bits per pixel per plane
+ * @num_planes: number of planes
+ * @hsub: horizontal subsampling factor
+ * @vsub: vertical subsampling factor
+ * @fmt: 7-bit format code for the fdp1 hardware
+ * @swap_yc: the Y and C components are swapped (Y comes before C)
+ * @swap_uv: the U and V components are swapped (V comes before U)
+ * @swap: swap register control
+ * @types: types of queue this format is applicable to
+ */
+struct fdp1_fmt {
+	u32	fourcc;
+	u8	bpp[3];
+	u8	num_planes;
+	u8	hsub;
+	u8	vsub;
+	u8	fmt;
+	bool	swap_yc;
+	bool	swap_uv;
+	u8	swap;
+	u8	types;
+};
+
+static const struct fdp1_fmt formats[] = {
+	/* RGB formats are only supported by the Write Pixel Formatter */
+
+	{ V4L2_PIX_FMT_RGB332, { 8, 0, 0}, 1, 1, 1, 0x00, false, false,
+	  RWPF_SWAP_LLWD | RWPF_SWAP_LWRD | RWPF_SWAP_WORD | RWPF_SWAP_BYTE,
+	  FDP1_CAPTURE },
+	{ V4L2_PIX_FMT_XRGB444, { 16, 0, 0}, 1, 1, 1, 0x01, false, false,
+	  RWPF_SWAP_LLWD | RWPF_SWAP_LWRD | RWPF_SWAP_WORD,
+	  FDP1_CAPTURE },
+	{ V4L2_PIX_FMT_XRGB555, { 16, 0, 0}, 1, 1, 1, 0x04, false, false,
+	  RWPF_SWAP_LLWD | RWPF_SWAP_LWRD | RWPF_SWAP_WORD,
+	  FDP1_CAPTURE },
+	{ V4L2_PIX_FMT_RGB565, { 16, 0, 0}, 1, 1, 1, 0x06, false, false,
+	  RWPF_SWAP_LLWD | RWPF_SWAP_LWRD | RWPF_SWAP_WORD,
+	  FDP1_CAPTURE },
+	{ V4L2_PIX_FMT_ABGR32, { 32, 0, 0}, 1, 1, 1, 0x13, false, false,
+	  RWPF_SWAP_LLWD | RWPF_SWAP_LWRD,
+	  FDP1_CAPTURE },
+	{ V4L2_PIX_FMT_XBGR32, { 32, 0, 0}, 1, 1, 1, 0x13, false, false,
+	  RWPF_SWAP_LLWD | RWPF_SWAP_LWRD,
+	  FDP1_CAPTURE },
+	{ V4L2_PIX_FMT_ARGB32, { 32, 0, 0}, 1, 1, 1, 0x13, false, false,
+	  RWPF_SWAP_LLWD | RWPF_SWAP_LWRD | RWPF_SWAP_WORD | RWPF_SWAP_BYTE,
+	  FDP1_CAPTURE },
+	{ V4L2_PIX_FMT_XRGB32, { 32, 0, 0}, 1, 1, 1, 0x13, false, false,
+	  RWPF_SWAP_LLWD | RWPF_SWAP_LWRD | RWPF_SWAP_WORD | RWPF_SWAP_BYTE,
+	  FDP1_CAPTURE },
+	{ V4L2_PIX_FMT_RGB24, { 24, 0, 0}, 1, 1, 1, 0x15, false, false,
+	  RWPF_SWAP_LLWD | RWPF_SWAP_LWRD | RWPF_SWAP_WORD | RWPF_SWAP_BYTE,
+	  FDP1_CAPTURE },
+	{ V4L2_PIX_FMT_BGR24, { 24, 0, 0}, 1, 1, 1, 0x18, false, false,
+	  RWPF_SWAP_LLWD | RWPF_SWAP_LWRD | RWPF_SWAP_WORD | RWPF_SWAP_BYTE,
+	  FDP1_CAPTURE },
+	{ V4L2_PIX_FMT_ARGB444, { 16, 0, 0}, 1, 1, 1, 0x19, false, false,
+	  RWPF_SWAP_LLWD | RWPF_SWAP_LWRD | RWPF_SWAP_WORD,
+	  FDP1_CAPTURE },
+	{ V4L2_PIX_FMT_ARGB555, { 16, 0, 0}, 1, 1, 1, 0x1b, false, false,
+	  RWPF_SWAP_LLWD | RWPF_SWAP_LWRD | RWPF_SWAP_WORD,
+	  FDP1_CAPTURE },
+
+	/* YUV Formats are supported by Read and Write Pixel Formatters */
+
+	{ V4L2_PIX_FMT_NV16M, { 8, 16, 0}, 2, 2, 1, 0x41, false, false,
+	  RWPF_SWAP_LLWD | RWPF_SWAP_LWRD | RWPF_SWAP_WORD | RWPF_SWAP_BYTE,
+	  FDP1_CAPTURE | FDP1_OUTPUT },
+	{ V4L2_PIX_FMT_NV61M, { 8, 16, 0}, 2, 2, 1, 0x41, false, true,
+	  RWPF_SWAP_LLWD | RWPF_SWAP_LWRD | RWPF_SWAP_WORD | RWPF_SWAP_BYTE,
+	  FDP1_CAPTURE | FDP1_OUTPUT },
+	{ V4L2_PIX_FMT_NV12M, { 8, 16, 0}, 2, 2, 2, 0x42, false, false,
+	  RWPF_SWAP_LLWD | RWPF_SWAP_LWRD | RWPF_SWAP_WORD | RWPF_SWAP_BYTE,
+	  FDP1_CAPTURE | FDP1_OUTPUT },
+	{ V4L2_PIX_FMT_NV21M, { 8, 16, 0}, 2, 2, 2, 0x42, false, true,
+	  RWPF_SWAP_LLWD | RWPF_SWAP_LWRD | RWPF_SWAP_WORD | RWPF_SWAP_BYTE,
+	  FDP1_CAPTURE | FDP1_OUTPUT },
+	{ V4L2_PIX_FMT_UYVY, { 16, 0, 0}, 1, 2, 1, 0x47, false, false,
+	  RWPF_SWAP_LLWD | RWPF_SWAP_LWRD | RWPF_SWAP_WORD | RWPF_SWAP_BYTE,
+	  FDP1_CAPTURE | FDP1_OUTPUT },
+	{ V4L2_PIX_FMT_VYUY, { 16, 0, 0}, 1, 2, 1, 0x47, false, true,
+	  RWPF_SWAP_LLWD | RWPF_SWAP_LWRD | RWPF_SWAP_WORD | RWPF_SWAP_BYTE,
+	  FDP1_CAPTURE | FDP1_OUTPUT },
+	{ V4L2_PIX_FMT_YUYV, { 16, 0, 0}, 1, 2, 1, 0x47, true, false,
+	  RWPF_SWAP_LLWD | RWPF_SWAP_LWRD | RWPF_SWAP_WORD | RWPF_SWAP_BYTE,
+	  FDP1_CAPTURE | FDP1_OUTPUT },
+	{ V4L2_PIX_FMT_YVYU, { 16, 0, 0}, 1, 2, 1, 0x47, true, true,
+	  RWPF_SWAP_LLWD | RWPF_SWAP_LWRD | RWPF_SWAP_WORD | RWPF_SWAP_BYTE,
+	  FDP1_CAPTURE | FDP1_OUTPUT },
+	{ V4L2_PIX_FMT_YUV444M, { 8, 8, 8}, 3, 1, 1, 0x4a, false, false,
+	  RWPF_SWAP_LLWD | RWPF_SWAP_LWRD | RWPF_SWAP_WORD | RWPF_SWAP_BYTE,
+	  FDP1_CAPTURE | FDP1_OUTPUT },
+	{ V4L2_PIX_FMT_YVU444M, { 8, 8, 8}, 3, 1, 1, 0x4a, false, true,
+	  RWPF_SWAP_LLWD | RWPF_SWAP_LWRD | RWPF_SWAP_WORD | RWPF_SWAP_BYTE,
+	  FDP1_CAPTURE | FDP1_OUTPUT },
+	{ V4L2_PIX_FMT_YUV422M, { 8, 8, 8}, 3, 2, 1, 0x4b, false, false,
+	  RWPF_SWAP_LLWD | RWPF_SWAP_LWRD | RWPF_SWAP_WORD | RWPF_SWAP_BYTE,
+	  FDP1_CAPTURE | FDP1_OUTPUT },
+	{ V4L2_PIX_FMT_YVU422M, { 8, 8, 8}, 3, 2, 1, 0x4b, false, true,
+	  RWPF_SWAP_LLWD | RWPF_SWAP_LWRD | RWPF_SWAP_WORD | RWPF_SWAP_BYTE,
+	  FDP1_CAPTURE | FDP1_OUTPUT },
+	{ V4L2_PIX_FMT_YUV420M, { 8, 8, 8}, 3, 2, 2, 0x4c, false, false,
+	  RWPF_SWAP_LLWD | RWPF_SWAP_LWRD | RWPF_SWAP_WORD | RWPF_SWAP_BYTE,
+	  FDP1_CAPTURE | FDP1_OUTPUT },
+	{ V4L2_PIX_FMT_YVU420M, { 8, 8, 8}, 3, 2, 2, 0x4c, false, true,
+	  RWPF_SWAP_LLWD | RWPF_SWAP_LWRD | RWPF_SWAP_WORD | RWPF_SWAP_BYTE,
+	  FDP1_CAPTURE | FDP1_OUTPUT },
+};
+
+#define NUM_FORMATS ARRAY_SIZE(formats)
+
+static int fdp1_fmt_is_rgb(const struct fdp1_fmt *fmt)
+{
+	return (fmt->fmt <= 0x1B); /* Last RGB code */
+}
+
+/* FDP1 Lookup tables range from 0...255 only */
+unsigned char fdp1_diff_adj[256] = {
+	0x00, 0x24, 0x43, 0x5E, 0x76, 0x8C, 0x9E, 0xAF,
+	0xBD, 0xC9, 0xD4, 0xDD, 0xE4, 0xEA, 0xEF, 0xF3,
+	0xF6, 0xF9, 0xFB, 0xFC, 0xFD, 0xFE, 0xFE, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
+
+unsigned char fdp1_sad_adj[256] = {
+	0x00, 0x24, 0x43, 0x5E, 0x76, 0x8C, 0x9E, 0xAF,
+	0xBD, 0xC9, 0xD4, 0xDD, 0xE4, 0xEA, 0xEF, 0xF3,
+	0xF6, 0xF9, 0xFB, 0xFC, 0xFD, 0xFE, 0xFE, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
+};
+
+unsigned char fdp1_bld_gain[256] = {
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80
+};
+
+unsigned char fdp1_dif_gain[256] = {
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80
+};
+
+unsigned char fdp1_mdet[256] = {
+	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+	0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+	0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+	0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
+	0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+	0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F,
+	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+	0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F,
+	0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+	0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F,
+	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+	0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F,
+	0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
+	0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
+	0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
+	0x78, 0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E, 0x7F,
+	0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+	0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F,
+	0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
+	0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F,
+	0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7,
+	0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF,
+	0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7,
+	0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF,
+	0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7,
+	0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF,
+	0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7,
+	0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF,
+	0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
+	0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
+	0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7,
+	0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF
+};
+
+/* Per-queue, driver-specific private data */
+struct fdp1_q_data {
+	const struct fdp1_fmt	*fmt;
+	struct v4l2_pix_format_mplane format;
+	unsigned int sequence;
+};
+
+enum {
+	V4L2_M2M_SRC = 0,
+	V4L2_M2M_DST = 1,
+};
+
+/* Custom controls */
+#define V4L2_CID_FPS			(V4L2_CID_USER_BASE + 0x1000)
+#define V4L2_CID_BEST_EFFORT		(V4L2_CID_USER_BASE + 0x1001)
+
+/* Flags that indicate processing mode */
+#define FDP1_BEST_EFFORT	BIT(0)
+
+static const struct fdp1_fmt *fdp1_find_format(u32 pixelformat,
+					 unsigned int fmt_type)
+{
+	const struct fdp1_fmt *fmt;
+	unsigned int k;
+
+	for (k = 0; k < NUM_FORMATS; k++) {
+		fmt = &formats[k];
+		if ((fmt->fourcc == pixelformat) && (fmt->types & fmt_type))
+			break;
+	}
+
+	if (k == NUM_FORMATS)
+		return NULL;
+
+	return &formats[k];
+}
+
+struct fdp1_dev {
+	struct v4l2_device	v4l2_dev;
+	struct video_device	vfd;
+
+	atomic_t		num_inst;
+	struct mutex		dev_mutex;
+	spinlock_t		irqlock;
+
+	void __iomem		*regs;
+	unsigned int		irq;
+	struct device		*dev;
+	void			*alloc_ctx;
+
+	unsigned int		clk_rate;
+
+	struct rcar_fcp_device	*fcp;
+	struct v4l2_m2m_dev	*m2m_dev;
+
+	struct dentry		*dbgroot;
+	struct dentry		*regset_dentry;
+	struct debugfs_regset32 regset;
+};
+
+struct fdp1_ctx {
+	struct v4l2_fh		fh;
+	struct fdp1_dev		*fdp1;
+
+	struct v4l2_ctrl_handler hdl;
+
+	/* Processed buffers in this transaction */
+	u8			num_processed;
+
+	/* Transaction length (i.e. how many buffers per transaction) */
+	u32			translen;
+
+	/* Abort requested by m2m */
+	int			aborting;
+
+	/* Processing mode */
+	int			mode;
+	enum v4l2_colorspace	colorspace;
+
+	/* User can request a specific rate, to use interrupt
+	 * driven processing, or set FPS==0 to request instant
+	 * processing (no-interrupt) mode
+	 */
+	int			fps;
+
+	/* Capture pipeline, can specify an alpha value
+	 * for supported formats. 0-255 only
+	 */
+	unsigned char		alpha;
+
+	/* Source and destination queue data */
+	struct fdp1_q_data   out_q; /* HW Source */
+	struct fdp1_q_data   cap_q; /* HW Destination */
+
+};
+
+static inline struct fdp1_ctx *fh_to_ctx(struct v4l2_fh *fh)
+{
+	return container_of(fh, struct fdp1_ctx, fh);
+}
+
+static struct fdp1_q_data *get_q_data(struct fdp1_ctx *ctx,
+					 enum v4l2_buf_type type)
+{
+	/* We only support MPLANE types in this driver */
+	WARN_ON(!(V4L2_TYPE_IS_MULTIPLANAR(type)));
+
+	if (V4L2_TYPE_IS_OUTPUT(type))
+		return &ctx->out_q;
+	else
+		return &ctx->cap_q;
+}
+
+static u32 fdp1_read(struct fdp1_dev *fdp1, unsigned int reg)
+{
+	if (debug >= 2)
+		dprintk(fdp1, "Read from %p\n", fdp1->regs + reg);
+
+	return ioread32(fdp1->regs + reg);
+}
+
+static void fdp1_write(struct fdp1_dev *fdp1, u32 val, unsigned int reg)
+{
+	if (debug >= 2)
+		dprintk(fdp1, "Write to %p\n", fdp1->regs + reg);
+
+	iowrite32(val, fdp1->regs + reg);
+}
+
+
+void fdp1_print_regs32(struct fdp1_dev *fdp1)
+{
+	int i;
+	const struct debugfs_reg32 *regs = fdp1->regset.regs;
+
+	for (i = 0; i < fdp1->regset.nregs; i++, regs++)
+		dprintk(fdp1, "%s = 0x%08x\n", regs->name,
+			   readl(fdp1->regset.base + regs->offset));
+}
+
+struct fdp1_plane_addrs {
+	dma_addr_t addr[3];
+};
+
+static struct fdp1_plane_addrs vb2_dc_to_pa(struct vb2_v4l2_buffer *buf,
+		unsigned int planes)
+{
+	struct fdp1_plane_addrs pa = { 0 };
+	struct vb2_buffer *vb2buf = &buf->vb2_buf;
+	int i;
+
+	for (i = 0; i < vb2buf->num_planes; ++i)
+		pa.addr[i] = vb2_dma_contig_plane_dma_addr(vb2buf, i);
+
+	return pa;
+}
+
+/* IPC registers are to be programmed with constant values */
+static void fdp1_set_ipc_dli(struct fdp1_ctx *ctx)
+{
+	struct fdp1_dev *fdp1 = ctx->fdp1;
+
+	fdp1_write(fdp1, IPC_SMSK_THRESH_CONST,	IPC_SMSK_THRESH);
+	fdp1_write(fdp1, IPC_COMB_DET_CONST,	IPC_COMB_DET);
+	fdp1_write(fdp1, IPC_MOTDEC_CONST,	IPC_MOTDEC);
+
+	fdp1_write(fdp1, IPC_DLI_BLEND_CONST,	IPC_DLI_BLEND);
+	fdp1_write(fdp1, IPC_DLI_HGAIN_CONST,	IPC_DLI_HGAIN);
+	fdp1_write(fdp1, IPC_DLI_SPRS_CONST,	IPC_DLI_SPRS);
+	fdp1_write(fdp1, IPC_DLI_ANGLE_CONST,	IPC_DLI_ANGLE);
+	fdp1_write(fdp1, IPC_DLI_ISOPIX0_CONST,	IPC_DLI_ISOPIX0);
+	fdp1_write(fdp1, IPC_DLI_ISOPIX1_CONST,	IPC_DLI_ISOPIX1);
+}
+
+
+static void fdp1_set_ipc_sensor(struct fdp1_ctx *ctx)
+{
+	struct fdp1_dev *fdp1 = ctx->fdp1;
+	struct fdp1_q_data *src_q_data = &ctx->out_q;
+	unsigned int xe, ye;
+	unsigned int x0, x1;
+	unsigned int hsize = src_q_data->format.width;
+	unsigned int vsize = src_q_data->format.height;
+
+	fdp1_write(fdp1, IPC_SENSOR_TH0_CONST,	IPC_SENSOR_TH0);
+	fdp1_write(fdp1, IPC_SENSOR_CTL0_CONST,	IPC_SENSOR_CTL0);
+	fdp1_write(fdp1, IPC_SENSOR_CTL1_CONST, IPC_SENSOR_CTL1);
+
+	if (src_q_data->format.field != V4L2_FIELD_NONE)
+		ye = (vsize * 2) - 1;
+	else
+		ye = vsize - 1;
+
+	xe = src_q_data->format.width - 1;
+	fdp1_write(fdp1, (xe << IPC_SENSOR_CTL2_X_SHIFT) |
+			 (ye << IPC_SENSOR_CTL2_Y_SHIFT), IPC_SENSOR_CTL2);
+
+	x0 = hsize / 3;
+	x1 = 2 * hsize / 3;
+
+	fdp1_write(fdp1, (x0 << IPC_SENSOR_CTL3_0_SHIFT) |
+			 (x1 << IPC_SENSOR_CTL3_1_SHIFT), IPC_SENSOR_CTL3);
+}
+
+
+static void fdp1_write_lut(struct fdp1_dev *fdp1,
+			   unsigned char *lut,
+			   unsigned int base)
+{
+	int i;
+
+	for (i = 0; i < 256; i++)
+		fdp1_write(fdp1, lut[i], base + (i*4));
+}
+
+static void fdp1_set_lut(struct fdp1_dev *fdp1)
+{
+	fdp1_write_lut(fdp1, fdp1_diff_adj,	LUT_DIF_ADJ);
+	fdp1_write_lut(fdp1, fdp1_sad_adj,	LUT_SAD_ADJ);
+	fdp1_write_lut(fdp1, fdp1_bld_gain,	LUT_BLD_GAIN);
+	fdp1_write_lut(fdp1, fdp1_dif_gain,	LUT_DIF_GAIN);
+	fdp1_write_lut(fdp1, fdp1_mdet,		LUT_MDET);
+}
+
+static void fdp1_configure_rpf(struct fdp1_ctx *ctx,
+			       struct fdp1_q_data *q_data,
+			       struct vb2_v4l2_buffer *src_buf)
+{
+	struct fdp1_dev *fdp1 = ctx->fdp1;
+
+	unsigned int picture_size;
+	unsigned int pstride;
+	unsigned int format;
+
+	struct fdp1_plane_addrs rpf_addr;
+
+	rpf_addr = vb2_dc_to_pa(src_buf, q_data->fmt->num_planes);
+
+	/* Picture size is common to Source AND Destination frames */
+	picture_size = ((q_data->format.width & RPF_SIZE_MASK)
+			<< RPF_SIZE_H_SHIFT);
+	picture_size |= ((q_data->format.height & RPF_SIZE_MASK)
+			<< RPF_SIZE_V_SHIFT);
+
+	/* Strides */
+	pstride = q_data->format.plane_fmt[0].bytesperline
+			<< RPF_PSTRIDE_Y_SHIFT;
+
+	if (q_data->format.num_planes > 1)
+		pstride |= q_data->format.plane_fmt[1].bytesperline
+			<< RPF_PSTRIDE_C_SHIFT;
+
+	/* Format control */
+	format = q_data->fmt->fmt;
+	if (q_data->fmt->swap_yc)
+		format |= RPF_FORMAT_RSPYCS;
+
+	if (q_data->fmt->swap_uv)
+		format |= RPF_FORMAT_RSPUVS;
+
+	/*
+	 * TODO: Device Process needs to be run multiple times per buffer
+	 * when fields are in one buffer, and this will need to alternate!
+	 */
+	if (V4L2_FIELD_HAS_BOTTOM(src_buf->field))
+		format |= RPF_FORMAT_CF; /* Set for Bottom field */
+
+	fdp1_write(fdp1, format, RPF_FORMAT);
+	fdp1_write(fdp1, q_data->fmt->swap, RPF_SWAP);
+	fdp1_write(fdp1, picture_size, RPF_SIZE);
+	fdp1_write(fdp1, pstride, RPF_PSTRIDE);
+
+	fdp1_write(fdp1, rpf_addr.addr[0], RPF1_ADDR_Y);
+	fdp1_write(fdp1, rpf_addr.addr[1], RPF1_ADDR_C0);
+	fdp1_write(fdp1, rpf_addr.addr[2], RPF1_ADDR_C1);
+}
+
+static void fdp1_configure_wpf(struct fdp1_ctx *ctx,
+			       struct fdp1_q_data *q_data,
+			       struct vb2_v4l2_buffer *dst_buf)
+{
+	struct fdp1_dev *fdp1 = ctx->fdp1;
+	/* I didn't want to have to reference the queue's directly,
+	 * but WPF uses the SRC queue for SWAP, and WRTM
+	 */
+	struct fdp1_q_data *src_q_data = &ctx->out_q;
+
+	unsigned int pstride;
+	unsigned int format;
+	unsigned int swap;
+
+	struct fdp1_plane_addrs wpf_addr;
+
+	wpf_addr = vb2_dc_to_pa(dst_buf, q_data->fmt->num_planes);
+
+	pstride = q_data->format.plane_fmt[0].bytesperline
+			<< WPF_PSTRIDE_Y_SHIFT;
+
+	if (q_data->format.num_planes > 1)
+		pstride |= q_data->format.plane_fmt[1].bytesperline
+			<< WPF_PSTRIDE_C_SHIFT;
+
+	format = q_data->fmt->fmt; /* Output Format Code */
+
+	if (q_data->fmt->swap_yc)
+		format |= WPF_FORMAT_WSPYCS;
+
+	if (q_data->fmt->swap_uv)
+		format |= WPF_FORMAT_WSPUVS;
+
+	if (fdp1_fmt_is_rgb(q_data->fmt)) {
+		unsigned int wrtm;
+		/* Enable Colour Space conversion */
+		format |= WPF_FORMAT_CSC;
+
+		/* Set WRTM */
+		if (src_q_data->format.ycbcr_enc == V4L2_COLORSPACE_REC709)
+			wrtm = WPF_FORMAT_WRTM_709_16;
+		else if (src_q_data->format.quantization ==
+				V4L2_QUANTIZATION_FULL_RANGE)
+			wrtm = WPF_FORMAT_WRTM_601_0;
+		else
+			wrtm = WPF_FORMAT_WRTM_601_16;
+
+		format |= (wrtm << WPF_FORMAT_WRTM_SHIFT);
+	}
+
+	/* Set an alpha value into the Pad Value */
+	format |= ctx->alpha << WPF_FORMAT_PDV_SHIFT;
+
+	/* WPF Swap needs both ISWAP and OSWAP setting */
+	swap = q_data->fmt->swap;
+	swap |= src_q_data->fmt->swap << WPF_SWAP_SSWAP_SHIFT;
+
+	fdp1_write(fdp1, format, WPF_FORMAT);
+	fdp1_write(fdp1, swap, WPF_SWAP);
+	fdp1_write(fdp1, pstride, WPF_PSTRIDE);
+
+	fdp1_write(fdp1, wpf_addr.addr[0], WPF_ADDR_Y);
+	fdp1_write(fdp1, wpf_addr.addr[1], WPF_ADDR_C0);
+	fdp1_write(fdp1, wpf_addr.addr[2], WPF_ADDR_C1);
+}
+
+static int device_process(struct fdp1_ctx *ctx,
+			  struct vb2_v4l2_buffer *src_buf,
+			  struct vb2_v4l2_buffer *dst_buf)
+{
+	struct fdp1_dev *fdp1 = ctx->fdp1;
+	struct fdp1_q_data *src_q_data = &ctx->out_q;
+	struct fdp1_q_data *dst_q_data = &ctx->cap_q;
+
+	unsigned int opmode, ipcmode;
+	unsigned int channels;
+
+	src_buf->sequence = src_q_data->sequence++;
+	dst_buf->sequence = dst_q_data->sequence++;
+
+	dst_buf->vb2_buf.timestamp = src_buf->vb2_buf.timestamp;
+
+	if (src_buf->flags & V4L2_BUF_FLAG_TIMECODE)
+		dst_buf->timecode = src_buf->timecode;
+	dst_buf->field = src_buf->field;
+	dst_buf->flags = src_buf->flags &
+		(V4L2_BUF_FLAG_TIMECODE |
+		 V4L2_BUF_FLAG_KEYFRAME |
+		 V4L2_BUF_FLAG_PFRAME |
+		 V4L2_BUF_FLAG_BFRAME |
+		 V4L2_BUF_FLAG_TSTAMP_SRC_MASK);
+
+	dprintk(fdp1, "\n\n");
+
+	/* First Frame only? ... */
+	fdp1_write(fdp1, CTL_CLKCTRL_CSTP_N, CTL_CLKCTRL);
+
+	/* Set the mode, and configuration */
+	channels = (CTL_CHACT_WR | CTL_CHACT_RD1); /* Always on */
+	ipcmode = IPC_MODE_DLI | IPC_MODE_DIM_FIXED2D;
+
+	/* Determine Mode, and Rate if requested */
+	if (ctx->fps) {
+		unsigned int period = fdp1->clk_rate / ctx->fps;
+
+		fdp1_write(fdp1, period, CTL_VPERIOD);
+		opmode = CTL_OPMODE_INTERRUPT;
+	} else
+		opmode = CTL_OPMODE_NO_INTERRUPT;
+
+	if (src_q_data->format.field == V4L2_FIELD_NONE)
+		opmode |= CTL_OPMODE_PRG;
+	else {
+		/* De-interlacing */
+		channels |= (CTL_CHACT_WR | CTL_CHACT_RD1);
+		/* ... A Work In Progress for the next version ... */
+		WARN_ON(1);
+	}
+
+	fdp1_write(fdp1, channels,	CTL_CHACT);
+	fdp1_write(fdp1, opmode,	CTL_OPMODE);
+	fdp1_write(fdp1, ipcmode,	IPC_MODE);
+
+	/* DLI Static Configuration */
+	fdp1_set_ipc_dli(ctx);
+
+	/* Sensor Configuration */
+	fdp1_set_ipc_sensor(ctx);
+
+	/* Setup the source picture */
+	fdp1_configure_rpf(ctx, src_q_data, src_buf);
+
+	/* Setup the destination picture */
+	fdp1_configure_wpf(ctx, dst_q_data, dst_buf);
+
+	/* Line Memory Pixel Number Register for linear access */
+	fdp1_write(fdp1, IPC_LMEM_LINEAR, IPC_LMEM);
+
+	/* Enable Interrupts */
+	fdp1_write(fdp1, CTL_IRQ_MASK, CTL_IRQENB);
+
+	/* Finally, the Immediate Registers */
+
+	/* Start the command */
+	fdp1_write(fdp1, CTL_CMD_STRCMD, CTL_CMD);
+
+	/* Registers will update to HW at next VINT */
+	fdp1_write(fdp1, CTL_REGEND_REGEND, CTL_REGEND);
+
+	/* Enable VINT Generator */
+	fdp1_write(fdp1, CTL_SGCMD_SGEN, CTL_SGCMD);
+
+	return 0;
+}
+
+/*
+ * mem2mem callbacks
+ */
+
+/**
+ * job_ready() - check whether an instance is ready to be scheduled to run
+ */
+static int job_ready(void *priv)
+{
+	struct fdp1_ctx *ctx = priv;
+
+	if (v4l2_m2m_num_src_bufs_ready(ctx->fh.m2m_ctx) < ctx->translen
+	    || v4l2_m2m_num_dst_bufs_ready(ctx->fh.m2m_ctx) < ctx->translen) {
+		dprintk(ctx->fdp1, "Not enough buffers available\n");
+		return 0;
+	}
+
+	return 1;
+}
+
+static void job_abort(void *priv)
+{
+	struct fdp1_ctx *ctx = priv;
+
+	/* Will cancel the transaction in the next interrupt handler */
+	ctx->aborting = 1;
+
+	/* Immediate abort sequence */
+	fdp1_write(ctx->fdp1, 0, CTL_SGCMD);
+	fdp1_write(ctx->fdp1, CTL_SRESET_SRST, CTL_SRESET);
+}
+
+/* device_run() - prepares and starts the device
+ *
+ * This simulates all the immediate preparations required before starting
+ * a device. This will be called by the framework when it decides to schedule
+ * a particular instance.
+ */
+static void device_run(void *priv)
+{
+	struct fdp1_ctx *ctx = priv;
+	struct vb2_v4l2_buffer *src_buf, *dst_buf;
+
+	src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
+	dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
+
+	device_process(ctx, src_buf, dst_buf);
+}
+
+static void device_isr(struct fdp1_dev *fdp1, enum vb2_buffer_state state)
+{
+	struct fdp1_ctx *curr_ctx;
+	struct vb2_v4l2_buffer *src_vb, *dst_vb;
+	unsigned long flags;
+
+	curr_ctx = v4l2_m2m_get_curr_priv(fdp1->m2m_dev);
+
+	if (curr_ctx == NULL) {
+		pr_err("Instance released before the end of transaction\n");
+		return;
+	}
+
+	src_vb = v4l2_m2m_src_buf_remove(curr_ctx->fh.m2m_ctx);
+	dst_vb = v4l2_m2m_dst_buf_remove(curr_ctx->fh.m2m_ctx);
+
+	curr_ctx->num_processed++;
+
+	spin_lock_irqsave(&fdp1->irqlock, flags);
+	v4l2_m2m_buf_done(src_vb, VB2_BUF_STATE_DONE);
+	v4l2_m2m_buf_done(dst_vb, state);
+	spin_unlock_irqrestore(&fdp1->irqlock, flags);
+
+	if (curr_ctx->num_processed == curr_ctx->translen
+	    || curr_ctx->aborting) {
+		dprintk(curr_ctx->fdp1, "Finishing transaction\n");
+		curr_ctx->num_processed = 0;
+		v4l2_m2m_job_finish(fdp1->m2m_dev, curr_ctx->fh.m2m_ctx);
+	} else {
+		device_run(curr_ctx);
+	}
+}
+
+
+/*
+ * video ioctls
+ */
+static int vidioc_querycap(struct file *file, void *priv,
+			   struct v4l2_capability *cap)
+{
+	strncpy(cap->driver, DRIVER_NAME, sizeof(cap->driver) - 1);
+	strncpy(cap->card, DRIVER_NAME, sizeof(cap->card) - 1);
+	snprintf(cap->bus_info, sizeof(cap->bus_info),
+			"platform:%s", DRIVER_NAME);
+	cap->device_caps = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING;
+	cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
+	return 0;
+}
+
+static int enum_fmt(struct v4l2_fmtdesc *f, u32 type)
+{
+	int i, num;
+
+	num = 0;
+
+	for (i = 0; i < NUM_FORMATS; ++i) {
+		if (formats[i].types & type) {
+			if (num == f->index)
+				break;
+			++num;
+		}
+	}
+
+	/* Format not found */
+	if (i >= NUM_FORMATS)
+		return -EINVAL;
+
+	/* Format found */
+	f->pixelformat = formats[i].fourcc;
+
+	return 0;
+}
+
+static int fdp1_enum_fmt_vid_cap(struct file *file, void *priv,
+				 struct v4l2_fmtdesc *f)
+{
+	return enum_fmt(f, FDP1_CAPTURE);
+}
+
+static int fdp1_enum_fmt_vid_out(struct file *file, void *priv,
+				   struct v4l2_fmtdesc *f)
+{
+	return enum_fmt(f, FDP1_OUTPUT);
+}
+
+static int fdp1_g_fmt(struct file *file, void *priv, struct v4l2_format *f)
+{
+	struct fdp1_q_data *q_data;
+	struct fdp1_ctx *ctx = fh_to_ctx(priv);
+
+	if (!v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type))
+		return -EINVAL;
+
+	q_data = get_q_data(ctx, f->type);
+	f->fmt.pix_mp = q_data->format;
+
+	return 0;
+}
+
+static int __fdp1_try_fmt(struct fdp1_ctx *ctx, const struct fdp1_fmt **fmtinfo,
+			  struct v4l2_pix_format_mplane *pix,
+			  enum v4l2_buf_type type)
+{
+	const struct fdp1_fmt *fmt;
+	unsigned int width = pix->width;
+	unsigned int height = pix->height;
+	unsigned int fmt_type;
+	unsigned int i;
+
+	static const u32 xrgb_formats[][2] = {
+		{ V4L2_PIX_FMT_RGB444, V4L2_PIX_FMT_XRGB444 },
+		{ V4L2_PIX_FMT_RGB555, V4L2_PIX_FMT_XRGB555 },
+		{ V4L2_PIX_FMT_BGR32, V4L2_PIX_FMT_XBGR32 },
+		{ V4L2_PIX_FMT_RGB32, V4L2_PIX_FMT_XRGB32 },
+	};
+
+	/* Backward compatibility: replace deprecated RGB formats by their XRGB
+	 * equivalent. This selects the format older userspace applications want
+	 * while still exposing the new format.
+	 */
+	for (i = 0; i < ARRAY_SIZE(xrgb_formats); ++i) {
+		if (xrgb_formats[i][0] == pix->pixelformat) {
+			pix->pixelformat = xrgb_formats[i][1];
+			break;
+		}
+	}
+
+	fmt_type = V4L2_TYPE_IS_OUTPUT(type) ? FDP1_OUTPUT : FDP1_CAPTURE;
+
+	fmt = fdp1_find_format(pix->pixelformat, fmt_type);
+	if (!fmt) {
+		/* Return the zero'th element for this type */
+		struct v4l2_fmtdesc f;
+
+		f.index = 0;
+		if (enum_fmt(&f, fmt_type))
+			return -EINVAL;
+
+		fmt = fdp1_find_format(f.pixelformat, fmt_type);
+		dev_dbg(ctx->fdp1->dev, "unknown format; set default format\n");
+	}
+
+	pix->pixelformat = fmt->fourcc;
+
+
+	/* Manage colorspace on the two queues */
+	if (V4L2_TYPE_IS_OUTPUT(type)) {
+
+		if (pix->ycbcr_enc == V4L2_YCBCR_ENC_DEFAULT)
+			pix->ycbcr_enc =
+				V4L2_MAP_YCBCR_ENC_DEFAULT(pix->colorspace);
+
+		if (pix->quantization == V4L2_QUANTIZATION_DEFAULT)
+			pix->quantization =
+				V4L2_MAP_QUANTIZATION_DEFAULT(false,
+						pix->colorspace,
+						pix->ycbcr_enc);
+	} else {
+		/* Manage the CAPTURE Queue */
+		struct fdp1_q_data *src_data = &ctx->out_q;
+
+		if (fdp1_fmt_is_rgb(fmt)) {
+			pix->colorspace = V4L2_COLORSPACE_SRGB;
+		} else {
+			/* Copy input queue colorspace across */
+			pix->colorspace = src_data->format.colorspace;
+			pix->ycbcr_enc = src_data->format.ycbcr_enc;
+			pix->quantization = src_data->format.quantization;
+		}
+	}
+
+	/* We should be allowing FIELDS through on the Output queue !*/
+	if (V4L2_TYPE_IS_OUTPUT(type)) {
+		/* Clamp to allowable field types */
+		if (pix->field == V4L2_FIELD_ANY ||
+		    pix->field == V4L2_FIELD_NONE)
+			pix->field = V4L2_FIELD_NONE;
+		else if (!V4L2_FIELD_HAS_BOTH(pix->field))
+			pix->field = V4L2_FIELD_INTERLACED;
+
+		dprintk(ctx->fdp1, "Output Field Type set as %d\n", pix->field);
+	} else
+		pix->field = V4L2_FIELD_NONE;
+
+	pix->num_planes = fmt->num_planes;
+	memset(pix->reserved, 0, sizeof(pix->reserved));
+
+	/* Align the width and height for YUV 4:2:2 and 4:2:0 formats. */
+	width = round_down(width, fmt->hsub);
+	height = round_down(height, fmt->vsub);
+
+	/* Clamp the width and height */
+	pix->width = clamp(width, MIN_W, MAX_W);
+	pix->height = clamp(height, MIN_H, MAX_H);
+
+
+	/* Compute and clamp the stride and image size. While not documented in
+	 * the datasheet, strides not aligned to a multiple of 128 bytes result
+	 * in image corruption.
+	 */
+	for (i = 0; i < min_t(unsigned int, fmt->num_planes, 2U); ++i) {
+		unsigned int hsub = i > 0 ? fmt->hsub : 1;
+		unsigned int vsub = i > 0 ? fmt->vsub : 1;
+		 /* From VSP : TODO: Confirm alignment limits for FDP1 */
+		unsigned int align = 128;
+		unsigned int bpl;
+
+		bpl = clamp_t(unsigned int, pix->plane_fmt[i].bytesperline,
+			      pix->width / hsub * fmt->bpp[i] / 8,
+			      round_down(65535U, align));
+
+		pix->plane_fmt[i].bytesperline = round_up(bpl, align);
+		pix->plane_fmt[i].sizeimage = pix->plane_fmt[i].bytesperline
+					    * pix->height / vsub;
+
+		memset(pix->plane_fmt[i].reserved, 0,
+				sizeof(pix->plane_fmt[i].reserved));
+	}
+
+	if (fmt->num_planes == 3) {
+		/* The second and third planes must have the same stride. */
+		pix->plane_fmt[2].bytesperline = pix->plane_fmt[1].bytesperline;
+		pix->plane_fmt[2].sizeimage = pix->plane_fmt[1].sizeimage;
+
+		memset(pix->plane_fmt[2].reserved, 0,
+				sizeof(pix->plane_fmt[2].reserved));
+	}
+
+	pix->num_planes = fmt->num_planes;
+
+	if (fmtinfo)
+		*fmtinfo = fmt;
+
+	return 0;
+}
+
+static int fdp1_try_fmt(struct file *file, void *priv, struct v4l2_format *f)
+{
+	struct fdp1_ctx *ctx = fh_to_ctx(priv);
+
+	if (!v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type))
+		return -EINVAL;
+
+	return __fdp1_try_fmt(ctx, NULL, &f->fmt.pix_mp, f->type);
+}
+
+static int fdp1_s_fmt(struct file *file, void *priv, struct v4l2_format *f)
+{
+	struct vb2_queue *vq;
+	struct fdp1_ctx *ctx = fh_to_ctx(priv);
+	struct v4l2_m2m_ctx *m2m_ctx = ctx->fh.m2m_ctx;
+	struct fdp1_q_data *q_data;
+	const struct fdp1_fmt *fmtinfo;
+	int ret;
+
+	vq = v4l2_m2m_get_vq(m2m_ctx, f->type);
+	if (!vq)
+		return -EINVAL;
+
+	if (vb2_is_busy(vq)) {
+		v4l2_err(&ctx->fdp1->v4l2_dev, "%s queue busy\n", __func__);
+		return -EBUSY;
+	}
+
+	ret = __fdp1_try_fmt(ctx, &fmtinfo, &f->fmt.pix_mp, f->type);
+	if (ret < 0)
+		return ret;
+
+	q_data = get_q_data(ctx, f->type);
+	q_data->format = f->fmt.pix_mp;
+	q_data->fmt = fmtinfo;
+
+	dprintk(ctx->fdp1,
+		"Setting format for type %d, wxh: %dx%d, fmt: %4s (%d)\n",
+			f->type, q_data->format.width, q_data->format.height,
+			(char *)&q_data->fmt->fourcc, q_data->fmt->fourcc);
+
+	return 0;
+}
+
+static int fdp1_s_ctrl(struct v4l2_ctrl *ctrl)
+{
+	struct fdp1_ctx *ctx =
+		container_of(ctrl->handler, struct fdp1_ctx, hdl);
+
+	switch (ctrl->id) {
+	case V4L2_CID_FPS:
+		ctx->fps = ctrl->val;
+		break;
+
+	case V4L2_CID_BEST_EFFORT:
+		if (ctrl->val)
+			ctx->mode |= FDP1_BEST_EFFORT;
+		else
+			ctx->mode &= ~FDP1_BEST_EFFORT;
+		break;		break;
+
+	case V4L2_CID_ALPHA_COMPONENT:
+		ctx->alpha = ctrl->val;
+		break;
+
+	default:
+		v4l2_err(&ctx->fdp1->v4l2_dev, "Invalid control\n");
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+static const struct v4l2_ctrl_ops fdp1_ctrl_ops = {
+	.s_ctrl = fdp1_s_ctrl,
+};
+
+
+static const struct v4l2_ioctl_ops fdp1_ioctl_ops = {
+	.vidioc_querycap	= vidioc_querycap,
+
+	.vidioc_enum_fmt_vid_cap_mplane = fdp1_enum_fmt_vid_cap,
+	.vidioc_enum_fmt_vid_out_mplane = fdp1_enum_fmt_vid_out,
+	.vidioc_g_fmt_vid_cap_mplane	= fdp1_g_fmt,
+	.vidioc_g_fmt_vid_out_mplane	= fdp1_g_fmt,
+	.vidioc_try_fmt_vid_cap_mplane	= fdp1_try_fmt,
+	.vidioc_try_fmt_vid_out_mplane	= fdp1_try_fmt,
+	.vidioc_s_fmt_vid_cap_mplane	= fdp1_s_fmt,
+	.vidioc_s_fmt_vid_out_mplane	= fdp1_s_fmt,
+
+	.vidioc_reqbufs		= v4l2_m2m_ioctl_reqbufs,
+	.vidioc_querybuf	= v4l2_m2m_ioctl_querybuf,
+	.vidioc_qbuf		= v4l2_m2m_ioctl_qbuf,
+	.vidioc_dqbuf		= v4l2_m2m_ioctl_dqbuf,
+	.vidioc_prepare_buf	= v4l2_m2m_ioctl_prepare_buf,
+	.vidioc_create_bufs	= v4l2_m2m_ioctl_create_bufs,
+	.vidioc_expbuf		= v4l2_m2m_ioctl_expbuf,
+
+	.vidioc_streamon	= v4l2_m2m_ioctl_streamon,
+	.vidioc_streamoff	= v4l2_m2m_ioctl_streamoff,
+
+	.vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
+	.vidioc_unsubscribe_event = v4l2_event_unsubscribe,
+};
+
+
+/*
+ * Queue operations
+ */
+
+static int fdp1_queue_setup(struct vb2_queue *vq,
+				unsigned int *nbuffers, unsigned int *nplanes,
+				unsigned int sizes[], void *alloc_ctxs[])
+{
+	struct fdp1_ctx *ctx = vb2_get_drv_priv(vq);
+	struct fdp1_q_data *q_data;
+	unsigned int i;
+
+	q_data = get_q_data(ctx, vq->type);
+
+	if (*nplanes) {
+		if (*nplanes != q_data->format.num_planes)
+			return -EINVAL;
+
+		for (i = 0; i < *nplanes; i++) {
+			unsigned int q_size;
+
+			q_size = q_data->format.plane_fmt[i].sizeimage;
+
+			if (sizes[i] < q_size)
+				return -EINVAL;
+
+			alloc_ctxs[i] = ctx->fdp1->alloc_ctx;
+		}
+
+		return 0;
+	}
+
+	*nplanes = q_data->format.num_planes;
+
+	for (i = 0; i < *nplanes; i++) {
+		sizes[i] = q_data->format.plane_fmt[i].sizeimage;
+		alloc_ctxs[i] = ctx->fdp1->alloc_ctx;
+	}
+
+	return 0;
+}
+
+static int fdp1_buf_prepare(struct vb2_buffer *vb)
+{
+	struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+	struct fdp1_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
+	struct fdp1_q_data *q_data;
+	unsigned int i;
+
+	q_data = get_q_data(ctx, vb->vb2_queue->type);
+
+	/* Default to Progressive if ANY selected */
+	if (vbuf->field == V4L2_FIELD_ANY)
+		vbuf->field = V4L2_FIELD_NONE;
+
+	/* We only support progressive CAPTURE */
+	if (!V4L2_TYPE_IS_OUTPUT(vb->vb2_queue->type)) {
+		if (vbuf->field != V4L2_FIELD_NONE) {
+			dev_err(ctx->fdp1->dev,
+				"%s field isn't supported on capture\n",
+				__func__);
+			return -EINVAL;
+		}
+	}
+
+	for (i = 0; i < q_data->format.num_planes; i++) {
+		unsigned long size = q_data->format.plane_fmt[i].sizeimage;
+
+		if (vb2_plane_size(vb, i) < size) {
+			dev_err(ctx->fdp1->dev,
+				"%s: data will not fit into plane [%d/%d] (%lu < %lu)\n",
+			       __func__,
+			       i, q_data->format.num_planes,
+			       vb2_plane_size(vb, i), size);
+			return -EINVAL;
+		}
+
+		/* We have known size formats all around */
+		vb2_set_plane_payload(vb, i, size);
+	}
+
+	return 0;
+}
+
+static void fdp1_buf_queue(struct vb2_buffer *vb)
+{
+	struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+	struct fdp1_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
+
+	v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vbuf);
+}
+
+static int fdp1_start_streaming(struct vb2_queue *q, unsigned int count)
+{
+	struct fdp1_ctx *ctx = vb2_get_drv_priv(q);
+	struct fdp1_q_data *q_data = get_q_data(ctx, q->type);
+
+	q_data->sequence = 0;
+	return 0;
+}
+
+static void fdp1_stop_streaming(struct vb2_queue *q)
+{
+	struct fdp1_ctx *ctx = vb2_get_drv_priv(q);
+	struct vb2_v4l2_buffer *vbuf;
+	unsigned long flags;
+
+	for (;;) {
+		if (V4L2_TYPE_IS_OUTPUT(q->type))
+			vbuf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
+		else
+			vbuf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
+		if (vbuf == NULL)
+			return;
+		spin_lock_irqsave(&ctx->fdp1->irqlock, flags);
+		v4l2_m2m_buf_done(vbuf, VB2_BUF_STATE_ERROR);
+		spin_unlock_irqrestore(&ctx->fdp1->irqlock, flags);
+	}
+}
+
+static struct vb2_ops fdp1_qops = {
+	.queue_setup	 = fdp1_queue_setup,
+	.buf_prepare	 = fdp1_buf_prepare,
+	.buf_queue	 = fdp1_buf_queue,
+	.start_streaming = fdp1_start_streaming,
+	.stop_streaming  = fdp1_stop_streaming,
+	.wait_prepare	 = vb2_ops_wait_prepare,
+	.wait_finish	 = vb2_ops_wait_finish,
+};
+
+static int queue_init(void *priv, struct vb2_queue *src_vq,
+		      struct vb2_queue *dst_vq)
+{
+	struct fdp1_ctx *ctx = priv;
+	int ret;
+
+	src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
+	src_vq->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF;
+	src_vq->drv_priv = ctx;
+	src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
+	src_vq->ops = &fdp1_qops;
+	src_vq->mem_ops = &vb2_dma_contig_memops;
+	src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+	src_vq->lock = &ctx->fdp1->dev_mutex;
+
+	ret = vb2_queue_init(src_vq);
+	if (ret)
+		return ret;
+
+	dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
+	dst_vq->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF;
+	dst_vq->drv_priv = ctx;
+	dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
+	dst_vq->ops = &fdp1_qops;
+	dst_vq->mem_ops = &vb2_dma_contig_memops;
+	dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+	dst_vq->lock = &ctx->fdp1->dev_mutex;
+
+	return vb2_queue_init(dst_vq);
+}
+
+/* This should move to a proper frame-interval setting */
+static const struct v4l2_ctrl_config fdp1_ctrl_fps = {
+	.ops = &fdp1_ctrl_ops,
+	.id = V4L2_CID_FPS,
+	.name = "Frames per second (0==free-run)",
+	.type = V4L2_CTRL_TYPE_INTEGER,
+	.def = 0,
+	.min = 0,
+	.max = 240,
+	.step = 1,
+};
+
+/* If a value is set for FPS, putting us into Interrupt Driven mode,
+ * we can choose what to do if a frame process exceeds the time available
+ * to meet the desired FPS. We can either error and abort the frame, or
+ * wait for the frame to finish anyway. This later option is 'best effort
+ * mode'
+ */
+static const struct v4l2_ctrl_config fdp1_ctrl_best_effort = {
+	.ops = &fdp1_ctrl_ops,
+	.id = V4L2_CID_BEST_EFFORT,
+	.name = "Best Effort Interrupt Mode",
+	.type = V4L2_CTRL_TYPE_INTEGER,
+	.def = 0,
+	.min = 0,
+	.max = 1,
+	.step = 1,
+};
+
+static void fdp1_get(struct fdp1_dev *fdp1)
+{
+	/*
+	 * It should be reasonable to have runtime hooks to call the fcp_enable
+	 * using the runtime_pm framework whenever it is needed,
+	 * however when I add in SET_RUNTIME_PM_OPS() and a .pm structure
+	 * the FDP1 no longer gets it's clock enabled.
+	 */
+	rcar_fcp_enable(fdp1->fcp);
+	pm_runtime_get_sync(fdp1->dev);
+}
+
+static void fdp1_put(struct fdp1_dev *fdp1)
+{
+	pm_runtime_put(fdp1->dev);
+	rcar_fcp_disable(fdp1->fcp);
+}
+
+/*
+ * File operations
+ */
+static int fdp1_open(struct file *file)
+{
+	struct fdp1_dev *fdp1 = video_drvdata(file);
+	struct fdp1_ctx *ctx = NULL;
+	int rc = 0;
+
+	if (mutex_lock_interruptible(&fdp1->dev_mutex))
+		return -ERESTARTSYS;
+
+	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
+	if (!ctx) {
+		rc = -ENOMEM;
+		goto open_unlock;
+	}
+
+	v4l2_fh_init(&ctx->fh, video_devdata(file));
+	file->private_data = &ctx->fh;
+	ctx->fdp1 = fdp1;
+
+	/* Initialise controls */
+
+	ctx->fps = 0;
+	ctx->translen = 1;
+
+	v4l2_ctrl_handler_init(&ctx->hdl, 3);
+	v4l2_ctrl_new_custom(&ctx->hdl, &fdp1_ctrl_fps, NULL);
+	v4l2_ctrl_new_custom(&ctx->hdl, &fdp1_ctrl_best_effort, NULL);
+	v4l2_ctrl_new_std(&ctx->hdl, &fdp1_ctrl_ops,
+			  V4L2_CID_ALPHA_COMPONENT, 0, 255, 1, 255);
+
+	if (ctx->hdl.error) {
+		rc = ctx->hdl.error;
+		v4l2_ctrl_handler_free(&ctx->hdl);
+		goto open_unlock;
+	}
+
+	ctx->fh.ctrl_handler = &ctx->hdl;
+	v4l2_ctrl_handler_setup(&ctx->hdl);
+
+	/* Configure default parameters. */
+	__fdp1_try_fmt(ctx, &ctx->out_q.fmt, &ctx->out_q.format,
+		      V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE);
+	__fdp1_try_fmt(ctx, &ctx->cap_q.fmt, &ctx->cap_q.format,
+		      V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE);
+
+	ctx->colorspace = V4L2_COLORSPACE_REC709;
+
+	ctx->fh.m2m_ctx = v4l2_m2m_ctx_init(fdp1->m2m_dev, ctx, &queue_init);
+
+	if (IS_ERR(ctx->fh.m2m_ctx)) {
+		rc = PTR_ERR(ctx->fh.m2m_ctx);
+
+		v4l2_ctrl_handler_free(&ctx->hdl);
+		kfree(ctx);
+		goto open_unlock;
+	}
+
+	/* Perform any power management required */
+	fdp1_get(fdp1);
+
+	v4l2_fh_add(&ctx->fh);
+	atomic_inc(&fdp1->num_inst);
+
+	dprintk(fdp1, "Created instance: %p, m2m_ctx: %p\n",
+		ctx, ctx->fh.m2m_ctx);
+
+open_unlock:
+	mutex_unlock(&fdp1->dev_mutex);
+	return rc;
+}
+
+static int fdp1_release(struct file *file)
+{
+	struct fdp1_dev *fdp1 = video_drvdata(file);
+	struct fdp1_ctx *ctx = fh_to_ctx(file->private_data);
+
+	dprintk(fdp1, "Releasing instance %p\n", ctx);
+
+	v4l2_fh_del(&ctx->fh);
+	v4l2_fh_exit(&ctx->fh);
+	v4l2_ctrl_handler_free(&ctx->hdl);
+	mutex_lock(&fdp1->dev_mutex);
+	v4l2_m2m_ctx_release(ctx->fh.m2m_ctx);
+	mutex_unlock(&fdp1->dev_mutex);
+	kfree(ctx);
+
+	atomic_dec(&fdp1->num_inst);
+
+	fdp1_put(fdp1);
+
+	return 0;
+}
+
+static const struct v4l2_file_operations fdp1_fops = {
+	.owner		= THIS_MODULE,
+	.open		= fdp1_open,
+	.release	= fdp1_release,
+	.poll		= v4l2_m2m_fop_poll,
+	.unlocked_ioctl	= video_ioctl2,
+	.mmap		= v4l2_m2m_fop_mmap,
+};
+
+static struct video_device fdp1_videodev = {
+	.name		= DRIVER_NAME,
+	.vfl_dir	= VFL_DIR_M2M,
+	.fops		= &fdp1_fops,
+	.ioctl_ops	= &fdp1_ioctl_ops,
+	.minor		= -1,
+	.release	= video_device_release_empty,
+};
+
+static struct v4l2_m2m_ops m2m_ops = {
+	.device_run	= device_run,
+	.job_ready	= job_ready,
+	.job_abort	= job_abort,
+};
+
+static irqreturn_t fdp1_irq_handler(int irq, void *dev_id)
+{
+	struct fdp1_dev *fdp1 = dev_id;
+
+	unsigned int int_status, scratch;
+	unsigned int cycles;
+
+	int_status = fdp1_read(fdp1, CTL_IRQSTA);
+
+	dprintk(fdp1, "IRQ: 0x%x %s%s%s\n", int_status,
+			int_status & CTL_IRQ_VERE ? "[Error]" : "[!E]",
+			int_status & CTL_IRQ_VINTE ? "[VSync]" : "[!V]",
+			int_status & CTL_IRQ_FREE ? "[FrameEnd]" : "[!F]");
+
+	cycles = fdp1_read(fdp1, CTL_VCYCLE_STATUS);
+	dprintk(fdp1, "CycleStatus = %d (%dms)\n",
+		      cycles, cycles/(fdp1->clk_rate/1000));
+
+	scratch = fdp1_read(fdp1, CTL_STATUS);
+	dprintk(fdp1, "Control Status = 0x%08x : VINT_CNT = %d %s:%s:%s:%s\n",
+			scratch, (scratch >> 16),
+			scratch & CTL_STATUS_SGREGSET ? "RegSet" : "",
+			scratch & CTL_STATUS_SGVERR ? "Vsync Error" : "",
+			scratch & CTL_STATUS_SGFREND ? "FrameEnd" : "",
+			scratch & CTL_STATUS_BSY ? "Busy.." : "");
+	dprintk(fdp1, "***********************************\n");
+	if (debug >= 2)
+		fdp1_print_regs32(fdp1);
+	dprintk(fdp1, "***********************************\n");
+
+	/* Spurious interrupt */
+	if (!((CTL_IRQ_MASK) & int_status))
+		return IRQ_NONE;
+
+	/* Clear interrupts */
+	fdp1_write(fdp1, ~(int_status & CTL_IRQ_MASK), CTL_IRQSTA);
+
+	/* Work completed Release the frames ... */
+	if (CTL_IRQ_VERE & int_status)
+		device_isr(fdp1, VB2_BUF_STATE_ERROR);
+	else if (CTL_IRQ_FREE & int_status)
+		device_isr(fdp1, VB2_BUF_STATE_DONE);
+
+	return IRQ_HANDLED;
+}
+
+static int fdp1_debugfs_init(struct fdp1_dev *fdp1)
+{
+
+	/* Debug FS Regset registration */
+	fdp1->regset.base = fdp1->regs;
+	fdp1->regset.regs = fdp1_regset;
+	fdp1->regset.nregs = NUM_FDP1_REGSETS;
+
+	fdp1->dbgroot = debugfs_create_dir(fdp1->v4l2_dev.name, NULL);
+	if (!fdp1->dbgroot)
+		return -ENOMEM;
+
+	fdp1->regset_dentry = debugfs_create_regset32("regs",
+			S_IRUGO, fdp1->dbgroot, &fdp1->regset);
+
+	if (!fdp1->regset_dentry) {
+		debugfs_remove_recursive(fdp1->dbgroot);
+		return -ENOMEM;
+	}
+
+	return 0;
+}
+
+static void fdp1_debugfs_remove(struct fdp1_dev *fdp1)
+{
+	debugfs_remove_recursive(fdp1->dbgroot);
+}
+
+static int fdp1_probe(struct platform_device *pdev)
+{
+	struct fdp1_dev *fdp1;
+	struct video_device *vfd;
+	struct device_node *fcp_node;
+	struct resource *res;
+	struct clk *clk;
+
+	int ret;
+	int hw_version;
+
+	fdp1 = devm_kzalloc(&pdev->dev, sizeof(*fdp1), GFP_KERNEL);
+	if (!fdp1)
+		return -ENOMEM;
+
+	spin_lock_init(&fdp1->irqlock);
+	fdp1->dev = &pdev->dev;
+	platform_set_drvdata(pdev, fdp1);
+
+	/* memory-mapped registers */
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	fdp1->regs = devm_ioremap_resource(&pdev->dev, res);
+	if (IS_ERR(fdp1->regs))
+		return PTR_ERR(fdp1->regs);
+
+	/* interrupt service routine registration */
+	fdp1->irq = ret = platform_get_irq(pdev, 0);
+	if (ret < 0) {
+		dev_err(&pdev->dev, "cannot find IRQ\n");
+		return ret;
+	}
+
+	ret = devm_request_irq(&pdev->dev, fdp1->irq, fdp1_irq_handler, 0,
+			       dev_name(&pdev->dev), fdp1);
+	if (ret) {
+		dev_err(&pdev->dev, "cannot claim IRQ %d\n", fdp1->irq);
+		return ret;
+	}
+
+	/* FCP */
+	fcp_node = of_parse_phandle(pdev->dev.of_node, "renesas,fcp", 0);
+	if (fcp_node) {
+		fdp1->fcp = rcar_fcp_get(fcp_node);
+		of_node_put(fcp_node);
+		if (IS_ERR(fdp1->fcp)) {
+			dev_err(&pdev->dev, "FCP not found (%ld)\n",
+				PTR_ERR(fdp1->fcp));
+			return PTR_ERR(fdp1->fcp);
+		}
+	}
+
+	/* Bring the device up ready for reading registers */
+	pm_runtime_enable(&pdev->dev);
+
+	/* Determine our clock rate */
+	clk = clk_get(&pdev->dev, NULL);
+	if (IS_ERR(clk))
+		return PTR_ERR(clk);
+
+	fdp1->clk_rate = clk_get_rate(clk);
+	clk_put(clk);
+
+	dprintk(fdp1, "Running at %d\n", fdp1->clk_rate);
+
+	ret = v4l2_device_register(&pdev->dev, &fdp1->v4l2_dev);
+	if (ret)
+		return ret;
+
+	atomic_set(&fdp1->num_inst, 0);
+	mutex_init(&fdp1->dev_mutex);
+
+	fdp1->vfd = fdp1_videodev;
+	vfd = &fdp1->vfd;
+	vfd->lock = &fdp1->dev_mutex;
+	vfd->v4l2_dev = &fdp1->v4l2_dev;
+
+	/* Power up the cells for the probe function */
+	fdp1_get(fdp1);
+
+	hw_version = fdp1_read(fdp1, IP_INTDATA);
+	switch (hw_version) {
+	case IP_H3:
+		dprintk(fdp1, "FDP1 Version R-Car H3\n");
+		break;
+	case IP_M3W:
+		dprintk(fdp1, "FDP1 Version R-Car M3-W\n");
+		break;
+	default:
+		dev_err(fdp1->dev, "FDP1 Unidentifiable (0x%08x)\n",
+				hw_version);
+		goto unreg_dev;
+	}
+
+	/* Memory allocation contexts */
+	fdp1->alloc_ctx = vb2_dma_contig_init_ctx(&pdev->dev);
+	if (IS_ERR(fdp1->alloc_ctx)) {
+		v4l2_err(&fdp1->v4l2_dev, "Failed to init memory allocator\n");
+		ret = PTR_ERR(fdp1->alloc_ctx);
+		goto unreg_dev;
+	}
+
+
+	ret = video_register_device(vfd, VFL_TYPE_GRABBER, 0);
+	if (ret) {
+		v4l2_err(&fdp1->v4l2_dev, "Failed to register video device\n");
+		goto vb2_allocator_rollback;
+	}
+
+	video_set_drvdata(vfd, fdp1);
+	snprintf(vfd->name, sizeof(vfd->name), "%s", fdp1_videodev.name);
+	v4l2_info(&fdp1->v4l2_dev,
+			"Device registered as /dev/video%d\n", vfd->num);
+
+	fdp1->m2m_dev = v4l2_m2m_init(&m2m_ops);
+	if (IS_ERR(fdp1->m2m_dev)) {
+		v4l2_err(&fdp1->v4l2_dev, "Failed to init mem2mem device\n");
+		ret = PTR_ERR(fdp1->m2m_dev);
+		goto err_m2m;
+	}
+
+	/* Program in the static LUTs */
+	fdp1_set_lut(fdp1);
+
+	/* Register debug fs entries */
+	fdp1_debugfs_init(fdp1);
+
+	/* Allow the hw to sleep until an open call puts it to use */
+	fdp1_put(fdp1);
+
+	return 0;
+
+err_m2m:
+	v4l2_m2m_release(fdp1->m2m_dev);
+	video_unregister_device(&fdp1->vfd);
+
+vb2_allocator_rollback:
+	vb2_dma_contig_cleanup_ctx(fdp1->alloc_ctx);
+
+unreg_dev:
+	v4l2_device_unregister(&fdp1->v4l2_dev);
+	fdp1_put(fdp1);
+
+	return ret;
+}
+
+static int fdp1_remove(struct platform_device *pdev)
+{
+	struct fdp1_dev *fdp1 = platform_get_drvdata(pdev);
+
+	v4l2_info(&fdp1->v4l2_dev, "Removing " DRIVER_NAME);
+	fdp1_debugfs_remove(fdp1);
+	v4l2_m2m_release(fdp1->m2m_dev);
+	video_unregister_device(&fdp1->vfd);
+	v4l2_device_unregister(&fdp1->v4l2_dev);
+	vb2_dma_contig_cleanup_ctx(fdp1->alloc_ctx);
+	pm_runtime_disable(&pdev->dev);
+
+	return 0;
+}
+
+static int fdp1_pm_runtime_suspend(struct device *dev)
+{
+	struct fdp1_dev *fdp1 = dev_get_drvdata(dev);
+
+	rcar_fcp_disable(fdp1->fcp);
+
+	return 0;
+}
+
+static int fdp1_pm_runtime_resume(struct device *dev)
+{
+	struct fdp1_dev *fdp1 = dev_get_drvdata(dev);
+
+	return rcar_fcp_enable(fdp1->fcp);
+}
+
+static const struct dev_pm_ops fdp1_pm_ops = {
+	SET_RUNTIME_PM_OPS(fdp1_pm_runtime_suspend,
+			   fdp1_pm_runtime_resume,
+			   NULL)
+};
+
+static const struct of_device_id fdp1_dt_ids[] = {
+	{ .compatible = "renesas,r8a7795-fdp1" },
+	{ .compatible = "renesas,r8a7796-fdp1" },
+	{ .compatible = "renesas,fdp1" },
+	{ },
+};
+MODULE_DEVICE_TABLE(of, fdp1_dt_ids);
+
+static struct platform_driver fdp1_pdrv = {
+	.probe		= fdp1_probe,
+	.remove		= fdp1_remove,
+	.driver		= {
+		.name	= DRIVER_NAME,
+		.of_match_table = fdp1_dt_ids,
+		/* .pm	= &fdp1_pm_ops, */
+	},
+};
+
+module_platform_driver(fdp1_pdrv);
+
+MODULE_DESCRIPTION("Renesas R-Car Fine Display Processor");
+MODULE_AUTHOR("Kieran Bingham, <kieran@bingham.xyz>");
+MODULE_LICENSE("GPL");
+MODULE_VERSION("0.1");
+MODULE_ALIAS("platform:" DRIVER_NAME);
-- 
2.7.4

[PATCH RFC 2/2] MAINTAINERS: Add support for FDP driver

[Kieran Bingham]

Signed-off-by: Kieran Bingham <kieran@bingham.xyz>
---
 MAINTAINERS | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 66de4da2d244..bc083b58e478 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7312,6 +7312,15 @@ S:	Supported
 F:	Documentation/devicetree/bindings/media/renesas,vsp1.txt
 F:	drivers/media/platform/vsp1/
 
+MEDIA DRIVERS FOR RENESAS - FDP1
+M:	Kieran Bingham <kieran@bingham.xyz>
+L:	linux-media@vger.kernel.org
+L:	linux-renesas-soc@vger.kernel.org
+T:	git git://linuxtv.org/media_tree.git
+S:	Supported
+F:	Documentation/devicetree/bindings/media/renesas,fdp1.txt
+F:	drivers/media/platform/rcar_fdp1.c
+
 MEDIA DRIVERS FOR ASCOT2E
 M:	Sergey Kozlov <serjk@netup.ru>
 L:	linux-media@vger.kernel.org
-- 
2.7.4

Re: [PATCH RFC 1/2] v4l: platform: Add Renesas R-Car FDP1 Driver

[Kieran Bingham]

Today I learned about make C=1

So ... reviewing my own patch, consider the following sparse warnings
'fixed up'

I'll run make C=1 before any future submissions from now on.


On 09/06/16 18:37, Kieran Bingham wrote:
> The FDP1 driver performs advanced de-interlacing on a memory 2 memory
> based video stream, and supports conversion from YCbCr/YUV
> to RGB pixel formats
> 
> Signed-off-by: Kieran Bingham <kieran@bingham.xyz>
> ---
>  drivers/media/platform/Kconfig     |   13 +
>  drivers/media/platform/Makefile    |    1 +
>  drivers/media/platform/rcar_fdp1.c | 2038 ++++++++++++++++++++++++++++++++++++
>  3 files changed, 2052 insertions(+)
>  create mode 100644 drivers/media/platform/rcar_fdp1.c

...

> +/* FDP1 Lookup tables range from 0...255 only */
> +unsigned char fdp1_diff_adj[256] = {
sparse: warning: symbol '...' was not declared. Should it be static?
+ static unsigned...

> +	0x00, 0x24, 0x43, 0x5E, 0x76, 0x8C, 0x9E, 0xAF,
...
> +	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
> +};
> +
> +unsigned char fdp1_sad_adj[256] = {
likewise

> +	0x00, 0x24, 0x43, 0x5E, 0x76, 0x8C, 0x9E, 0xAF,
...
> +	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
> +};
> +
> +unsigned char fdp1_bld_gain[256] = {
and again ...
> +	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
...
> +	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80
> +};
> +
> +unsigned char fdp1_dif_gain[256] = {
> +	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
...
> +	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80
> +};
> +
> +unsigned char fdp1_mdet[256] = {
and finally for the lut...
> +	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
...
> +	0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF
> +};
> +
...

> +static void fdp1_write(struct fdp1_dev *fdp1, u32 val, unsigned int reg)
> +{
> +	if (debug >= 2)
> +		dprintk(fdp1, "Write to %p\n", fdp1->regs + reg);
> +
> +	iowrite32(val, fdp1->regs + reg);
> +}
> +
> +
> +void fdp1_print_regs32(struct fdp1_dev *fdp1)
Another +static

...

> +static struct fdp1_plane_addrs vb2_dc_to_pa(struct vb2_v4l2_buffer *buf,
> +		unsigned int planes)
> +{
> +	struct fdp1_plane_addrs pa = { 0 };

sparse: warning: missing braces around initializer
+ struct fdp1_plane_addrs pa = { { 0 } };

-- 
Regards

Kieran Bingham