[PATCH/HACK 0/7] r8a779[01]: Enable IOMMU usage for the VSP1 and DU

[PATCH/HACK 0/7] r8a779[01]: Enable IOMMU usage for the VSP1 and DU

[Laurent Pinchart]

Hello,

This patch series enables IOMMU usage for the VSP1 and DU on the R8A7790 (H2)
and R8A7791 (M2) platforms. It is available for convenience at

	git://linuxtv.org/pinchartl/media.git iommu/devel/dt

The patches are not meant to be merged upstream at this time, but serve as a
base to implement and test IPMMU support in the VSP1 and DU on Gen2 (quite
obviously).

Less obviously, the patches are also useful for Gen3 development. The H3 IPMMU
hardware is known to be buggy, but development can be performed on Gen2 to
some extent by mimicking the Gen3 VSP1 + DU combination. This is performed by
patches 4/7 to 7/7 for H2. Corresponding patches for M2 are straightforward to
implement.

Please note that applying the last three patches break DU operation as the
framebuffers are mapped through the wrong IPMMU instance. This will be fixed
by a subsequent patch series, these patches only serve as a development base.

Laurent Pinchart (7):
  ARM: shmobile: r8a7790: Enable IOMMU usage for the DU
  ARM: shmobile: r8a7791: Enable IOMMU usage for the DU
  ARM: shmobile: r8a7790: Enable IOMMU usage for the VSP1
  ARM: shmobile: r8a7791: Enable IOMMU usage for the VSP1
  [HACK] ARM: shmobile: r8a7790: Link the VSP1 and DU
  [HACK] v4l: vsp1: Disable UAPI for VSP1D
  [HACK] drm: rcar-du: Enable VSP source support for R8A7790

 arch/arm/boot/dts/r8a7790.dtsi         | 23 ++++++++++++++---------
 arch/arm/boot/dts/r8a7791.dtsi         |  9 ++++++++-
 drivers/gpu/drm/rcar-du/rcar_du_drv.c  |  9 +++++----
 drivers/media/platform/vsp1/vsp1_drv.c |  1 -
 4 files changed, 27 insertions(+), 15 deletions(-)

-- 
Regards,

Laurent Pinchart

[PATCH/HACK 1/7] ARM: shmobile: r8a7790: Enable IOMMU usage for the DU

[Laurent Pinchart]

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 arch/arm/boot/dts/r8a7790.dtsi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index d18558f21102..87c4344424a0 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -1010,6 +1010,8 @@
 		clock-names = "du.0", "du.1", "du.2", "lvds.0", "lvds.1";
 		status = "disabled";
 
+		iommus = <&ipmmu_mx 15 &ipmmu_mx 16>;
+
 		ports {
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -1916,7 +1918,6 @@
 		interrupts = <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>,
 			     <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
 		#iommu-cells = <1>;
-		status = "disabled";
 	};
 
 	ipmmu_rt: mmu@ffc80000 {
-- 
Regards,

Laurent Pinchart

[PATCH/HACK 2/7] ARM: shmobile: r8a7791: Enable IOMMU usage for the DU

[Laurent Pinchart]

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 arch/arm/boot/dts/r8a7791.dtsi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 8f0086bbd96b..411c36dbbe7b 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -1032,6 +1032,8 @@
 		clock-names = "du.0", "du.1", "lvds.0";
 		status = "disabled";
 
+		iommus = <&ipmmu_mx 15>;
+
 		ports {
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -1710,7 +1712,6 @@
 		interrupts = <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>,
 			     <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
 		#iommu-cells = <1>;
-		status = "disabled";
 	};
 
 	ipmmu_rt: mmu@ffc80000 {
-- 
Regards,

Laurent Pinchart

[PATCH/HACK 3/7] ARM: shmobile: r8a7790: Enable IOMMU usage for the VSP1

[Laurent Pinchart]

Each VSP instance has two memory bus master ports, one of data transfer
and one for command transfer. Specify the related IOMMUs.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 arch/arm/boot/dts/r8a7790.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 87c4344424a0..637cb8be363f 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -945,6 +945,8 @@
 		clocks = <&mstp1_clks R8A7790_CLK_VSP1_R>;
 		power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
 
+		iommus = <&ipmmu_mx 4 &ipmmu_mx 6>;
+
 		renesas,has-sru;
 		renesas,#rpf = <5>;
 		renesas,#uds = <1>;
@@ -958,6 +960,8 @@
 		clocks = <&mstp1_clks R8A7790_CLK_VSP1_S>;
 		power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
 
+		iommus = <&ipmmu_mx 4 &ipmmu_mx 10>;
+
 		renesas,has-lut;
 		renesas,has-sru;
 		renesas,#rpf = <5>;
@@ -972,6 +976,8 @@
 		clocks = <&mstp1_clks R8A7790_CLK_VSP1_DU0>;
 		power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
 
+		iommus = <&ipmmu_mx 5 &ipmmu_mx 13>;
+
 		renesas,has-lif;
 		renesas,has-lut;
 		renesas,#rpf = <4>;
@@ -986,6 +992,8 @@
 		clocks = <&mstp1_clks R8A7790_CLK_VSP1_DU1>;
 		power-domains = <&sysc R8A7790_PD_ALWAYS_ON>;
 
+		iommus = <&ipmmu_mx 5 &ipmmu_mx 14>;
+
 		renesas,has-lif;
 		renesas,has-lut;
 		renesas,#rpf = <4>;
-- 
Regards,

Laurent Pinchart

[PATCH/HACK 4/7] ARM: shmobile: r8a7791: Enable IOMMU usage for the VSP1

[Laurent Pinchart]

Each VSP instance has two memory bus master ports, one of data transfer
and one for command transfer. Specify the related IOMMUs.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 arch/arm/boot/dts/r8a7791.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 411c36dbbe7b..4cb4076bcd13 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -984,6 +984,8 @@
 		clocks = <&mstp1_clks R8A7791_CLK_VSP1_S>;
 		power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
 
+		iommus = <&ipmmu_mx 4 &ipmmu_mx 10>;
+
 		renesas,has-lut;
 		renesas,has-sru;
 		renesas,#rpf = <5>;
@@ -998,6 +1000,8 @@
 		clocks = <&mstp1_clks R8A7791_CLK_VSP1_DU0>;
 		power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
 
+		iommus = <&ipmmu_mx 5 &ipmmu_mx 13>;
+
 		renesas,has-lif;
 		renesas,has-lut;
 		renesas,#rpf = <4>;
@@ -1012,6 +1016,8 @@
 		clocks = <&mstp1_clks R8A7791_CLK_VSP1_DU1>;
 		power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
 
+		iommus = <&ipmmu_mx 5 &ipmmu_mx 14>;
+
 		renesas,has-lif;
 		renesas,has-lut;
 		renesas,#rpf = <4>;
-- 
Regards,

Laurent Pinchart

[PATCH/HACK 5/7] [HACK] ARM: shmobile: r8a7790: Link the VSP1 and DU

[Laurent Pinchart]

In order to test VSP+DU integration for Gen3 on Gen2, link the VSPD
instances to the DU and modify their features to match the Gen3 VSPD.
Remove the IOMMU properties for the DU as memory is now accessed through
the VSPD.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 arch/arm/boot/dts/r8a7790.dtsi | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 637cb8be363f..0ff45867e711 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -969,7 +969,7 @@
 		renesas,#wpf = <4>;
 	};
 
-	vsp1@fe930000 {
+	vsp1d0: vsp1@fe930000 {
 		compatible = "renesas,vsp1";
 		reg = <0 0xfe930000 0 0x8000>;
 		interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
@@ -979,13 +979,11 @@
 		iommus = <&ipmmu_mx 5 &ipmmu_mx 13>;
 
 		renesas,has-lif;
-		renesas,has-lut;
 		renesas,#rpf = <4>;
-		renesas,#uds = <1>;
-		renesas,#wpf = <4>;
+		renesas,#wpf = <1>;
 	};
 
-	vsp1@fe938000 {
+	vsp1d1: vsp1@fe938000 {
 		compatible = "renesas,vsp1";
 		reg = <0 0xfe938000 0 0x8000>;
 		interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>;
@@ -995,10 +993,8 @@
 		iommus = <&ipmmu_mx 5 &ipmmu_mx 14>;
 
 		renesas,has-lif;
-		renesas,has-lut;
 		renesas,#rpf = <4>;
-		renesas,#uds = <1>;
-		renesas,#wpf = <4>;
+		renesas,#wpf = <1>;
 	};
 
 	du: display@feb00000 {
@@ -1018,7 +1014,7 @@
 		clock-names = "du.0", "du.1", "du.2", "lvds.0", "lvds.1";
 		status = "disabled";
 
-		iommus = <&ipmmu_mx 15 &ipmmu_mx 16>;
+		vsps = <&vsp1d0 &vsp1d1>;
 
 		ports {
 			#address-cells = <1>;
-- 
Regards,

Laurent Pinchart

Re: [PATCH/HACK 5/7] [HACK] ARM: shmobile: r8a7790: Link the VSP1 and DU

[Geert Uytterhoeven]

Hi Laurent,

On Thu, Aug 18, 2016 at 6:03 PM, Laurent Pinchart
<laurent.pinchart+renesas@ideasonboard.com> wrote:
> In order to test VSP+DU integration for Gen3 on Gen2, link the VSPD
> instances to the DU and modify their features to match the Gen3 VSPD.

Why do you modify the feature properties? AFAIK the driver doesn't
look at them anyway.

> Remove the IOMMU properties for the DU as memory is now accessed through
> the VSPD.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> ---
>  arch/arm/boot/dts/r8a7790.dtsi | 14 +++++---------
>  1 file changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
> index 637cb8be363f..0ff45867e711 100644
> --- a/arch/arm/boot/dts/r8a7790.dtsi
> +++ b/arch/arm/boot/dts/r8a7790.dtsi
> @@ -969,7 +969,7 @@
>                 renesas,#wpf = <4>;
>         };
>
> -       vsp1@fe930000 {
> +       vsp1d0: vsp1@fe930000 {
>                 compatible = "renesas,vsp1";
>                 reg = <0 0xfe930000 0 0x8000>;
>                 interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
> @@ -979,13 +979,11 @@
>                 iommus = <&ipmmu_mx 5 &ipmmu_mx 13>;
>
>                 renesas,has-lif;
> -               renesas,has-lut;
>                 renesas,#rpf = <4>;
> -               renesas,#uds = <1>;
> -               renesas,#wpf = <4>;
> +               renesas,#wpf = <1>;
>         };

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/HACK 5/7] [HACK] ARM: shmobile: r8a7790: Link the VSP1 and DU

[Laurent Pinchart]

Hi Geert,

On Friday 19 Aug 2016 09:06:57 Geert Uytterhoeven wrote:
> On Thu, Aug 18, 2016 at 6:03 PM, Laurent Pinchart wrote:
> > In order to test VSP+DU integration for Gen3 on Gen2, link the VSPD
> > instances to the DU and modify their features to match the Gen3 VSPD.
> 
> Why do you modify the feature properties? AFAIK the driver doesn't
> look at them anyway.

It was a leftover, that's not needed indeed. It will go away when I'll rebase 
the series on top of your patch that removes those properties from 
r8a7790.dtsi.

> > Remove the IOMMU properties for the DU as memory is now accessed through
> > the VSPD.
> > 
> > Signed-off-by: Laurent Pinchart
> > <laurent.pinchart+renesas@ideasonboard.com>
> > ---
> > 
> >  arch/arm/boot/dts/r8a7790.dtsi | 14 +++++---------
> >  1 file changed, 5 insertions(+), 9 deletions(-)
> > 
> > diff --git a/arch/arm/boot/dts/r8a7790.dtsi
> > b/arch/arm/boot/dts/r8a7790.dtsi index 637cb8be363f..0ff45867e711 100644
> > --- a/arch/arm/boot/dts/r8a7790.dtsi
> > +++ b/arch/arm/boot/dts/r8a7790.dtsi
> > @@ -969,7 +969,7 @@
> >                 renesas,#wpf = <4>;
> >         };
> > 
> > -       vsp1@fe930000 {
> > +       vsp1d0: vsp1@fe930000 {
> >                 compatible = "renesas,vsp1";
> >                 reg = <0 0xfe930000 0 0x8000>;
> >                 interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
> > @@ -979,13 +979,11 @@
> >                 iommus = <&ipmmu_mx 5 &ipmmu_mx 13>;
> >                 
> >                 renesas,has-lif;
> > -               renesas,has-lut;
> >                 renesas,#rpf = <4>;
> > -               renesas,#uds = <1>;
> > -               renesas,#wpf = <4>;
> > +               renesas,#wpf = <1>;
> >         };

-- 
Regards,

Laurent Pinchart

[PATCH/HACK 6/7] [HACK] v4l: vsp1: Disable UAPI for VSP1D

[Laurent Pinchart]

VSP1D is controlled from within the kernel by the DU DRM/KMS driver,
disabling the VSP userspace API.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 drivers/media/platform/vsp1/vsp1_drv.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c
index 64d832ef9ef3..2c2bb68df626 100644
--- a/drivers/media/platform/vsp1/vsp1_drv.c
+++ b/drivers/media/platform/vsp1/vsp1_drv.c
@@ -611,7 +611,6 @@ static const struct vsp1_device_info vsp1_device_infos[] = {
 		.uds_count = 1,
 		.wpf_count = 1,
 		.num_bru_inputs = 4,
-		.uapi = true,
 	}, {
 		.version = VI6_IP_VERSION_MODEL_VSPS_M2,
 		.model = "VSP1-S",
-- 
Regards,

Laurent Pinchart

[PATCH/HACK 7/7] [HACK] drm: rcar-du: Enable VSP source support for R8A7790

[Laurent Pinchart]

Pretend the R8A7790 requires usage of VSP composition to test the
feature until Gen3 hardware is available. As the driver requires one
VSP1 instance per CRTC, disable DU2.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 drivers/gpu/drm/rcar-du/rcar_du_drv.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
index 899ef7a2a7b4..93888e41487c 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
@@ -60,15 +60,16 @@ static const struct rcar_du_device_info rcar_du_r8a7779_info = {
 static const struct rcar_du_device_info rcar_du_r8a7790_info = {
 	.gen = 2,
 	.features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK
-		  | RCAR_DU_FEATURE_EXT_CTRL_REGS,
+		  | RCAR_DU_FEATURE_EXT_CTRL_REGS
+		  | RCAR_DU_FEATURE_VSP1_SOURCE,
 	.quirks = RCAR_DU_QUIRK_ALIGN_128B | RCAR_DU_QUIRK_LVDS_LANES,
-	.num_crtcs = 3,
+	.num_crtcs = 2,
 	.routes = {
 		/* R8A7790 has one RGB output, two LVDS outputs and one
 		 * (currently unsupported) TCON output.
 		 */
 		[RCAR_DU_OUTPUT_DPAD0] = {
-			.possible_crtcs = BIT(2) | BIT(1) | BIT(0),
+			.possible_crtcs = BIT(1) | BIT(0),
 			.encoder_type = DRM_MODE_ENCODER_NONE,
 			.port = 0,
 		},
@@ -78,7 +79,7 @@ static const struct rcar_du_device_info rcar_du_r8a7790_info = {
 			.port = 1,
 		},
 		[RCAR_DU_OUTPUT_LVDS1] = {
-			.possible_crtcs = BIT(2) | BIT(1),
+			.possible_crtcs = BIT(1),
 			.encoder_type = DRM_MODE_ENCODER_LVDS,
 			.port = 2,
 		},
-- 
Regards,

Laurent Pinchart