[PATCH v2 0/2] arm64: dts: renesas: Add LIF channel to 'vsps' property

[PATCH v2 0/2] arm64: dts: renesas: Add LIF channel to 'vsps' property

[Jacopo Mondi]

V2 of this patch splits the DTS changes from the updating of the DU driver
comment as suggested by Laurent and Geert.

Patches based on renesas-devel-2019-08-21.

Thanks
  j

Jacopo Mondi (2):
  arm64: dts: renesas: Add LIF channel indices to vsps property
  drm: rcar-du: kms: Expand comment in vsps parsing routine

 arch/arm64/boot/dts/renesas/r8a774a1.dtsi    | 2 +-
 arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 2 +-
 arch/arm64/boot/dts/renesas/r8a7796.dtsi     | 2 +-
 arch/arm64/boot/dts/renesas/r8a77970.dtsi    | 2 +-
 arch/arm64/boot/dts/renesas/r8a77980.dtsi    | 2 +-
 drivers/gpu/drm/rcar-du/rcar_du_kms.c        | 6 +++++-
 6 files changed, 10 insertions(+), 6 deletions(-)

--
2.23.0

[PATCH v2 1/2] arm64: dts: renesas: Add LIF channel indices to vsps property

[Jacopo Mondi]

According to the Renesas R-Car DU bindings documentation, the 'vsps'
property should be composed of a phandle to the VSP instance and the
index of the LIF channel assigned to the DU channel. Some SoC device
tree source files do not specify any LIF channel index, relying on the
driver defaulting it to 0 if not specified.

Align all device tree files by specifying the LIF channel index as
prescribed by the bindings documentation.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
---
 arch/arm64/boot/dts/renesas/r8a774a1.dtsi    | 2 +-
 arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 2 +-
 arch/arm64/boot/dts/renesas/r8a7796.dtsi     | 2 +-
 arch/arm64/boot/dts/renesas/r8a77970.dtsi    | 2 +-
 arch/arm64/boot/dts/renesas/r8a77980.dtsi    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
index 06c7c849c8ab..d179ee3da308 100644
--- a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
@@ -2651,7 +2651,7 @@
 			clock-names = "du.0", "du.1", "du.2";
 			status = "disabled";

-			vsps = <&vspd0 &vspd1 &vspd2>;
+			vsps = <&vspd0 0>, <&vspd1 0>, <&vspd2 0>;

 			ports {
 				#address-cells = <1>;
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
index e4650ae5b75a..14d8513d2a47 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
@@ -30,7 +30,7 @@
 };

 &du {
-	vsps = <&vspd0 &vspd1 &vspd2 &vspd3>;
+	vsps = <&vspd0 0>, <&vspd1 0>, <&vspd2 0>, <&vspd3 0>;
 };

 &fcpvb1 {
diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
index 3dc9d73f589a..8c9bf985d436 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
@@ -2765,7 +2765,7 @@
 			clock-names = "du.0", "du.1", "du.2";
 			status = "disabled";

-			vsps = <&vspd0 &vspd1 &vspd2>;
+			vsps = <&vspd0 0>, <&vspd1 0>, <&vspd2 0>;

 			ports {
 				#address-cells = <1>;
diff --git a/arch/arm64/boot/dts/renesas/r8a77970.dtsi b/arch/arm64/boot/dts/renesas/r8a77970.dtsi
index 0cd3b376635d..2c4ab70e2a39 100644
--- a/arch/arm64/boot/dts/renesas/r8a77970.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77970.dtsi
@@ -1120,7 +1120,7 @@
 			clock-names = "du.0";
 			power-domains = <&sysc R8A77970_PD_ALWAYS_ON>;
 			resets = <&cpg 724>;
-			vsps = <&vspd0>;
+			vsps = <&vspd0 0>;
 			status = "disabled";

 			ports {
diff --git a/arch/arm64/boot/dts/renesas/r8a77980.dtsi b/arch/arm64/boot/dts/renesas/r8a77980.dtsi
index 461a47ea656d..042f4089e546 100644
--- a/arch/arm64/boot/dts/renesas/r8a77980.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77980.dtsi
@@ -1495,7 +1495,7 @@
 			clock-names = "du.0";
 			power-domains = <&sysc R8A77980_PD_ALWAYS_ON>;
 			resets = <&cpg 724>;
-			vsps = <&vspd0>;
+			vsps = <&vspd0 0>;
 			status = "disabled";

 			ports {
--
2.23.0

[PATCH v2 2/2] drm: rcar-du: kms: Expand comment in vsps parsing routine

[Jacopo Mondi]

Exand comment in the 'vsps' parsing routine to specify why the LIF
channel index is defaulted to 0 in case the second cell of the property
is not specified.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
---
 drivers/gpu/drm/rcar-du/rcar_du_kms.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
index 2dc9caee8767..0d59f390de19 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
@@ -585,7 +585,11 @@ static int rcar_du_vsps_init(struct rcar_du_device *rcdu)

 		vsps[j].crtcs_mask |= BIT(i);

-		/* Store the VSP pointer and pipe index in the CRTC. */
+		/*
+		 * Store the VSP pointer and pipe index in the CRTC. If the
+		 * second cell of the 'vsps' specifier isn't present, default
+		 * to 0 to remain compatible with older DT bindings.
+		 */
 		rcdu->crtcs[i].vsp = &rcdu->vsps[j];
 		rcdu->crtcs[i].vsp_pipe = cells >= 1 ? args.args[0] : 0;
 	}
--
2.23.0

Re: [PATCH v2 2/2] drm: rcar-du: kms: Expand comment in vsps parsing routine

[Laurent Pinchart]

Hi Jacopo,

Thank you for the patch.

How about changing the subject to "drm: rcar-du: Document DT backward
compatibility" ?

On Sun, Aug 25, 2019 at 04:01:35PM +0200, Jacopo Mondi wrote:
> Exand comment in the 'vsps' parsing routine to specify why the LIF

s/Exand/Expand/

> channel index is defaulted to 0 in case the second cell of the property

s/is defaulted to 0/defaults to 0/

> is not specified.

You could explain it here too :-)

> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
> ---
>  drivers/gpu/drm/rcar-du/rcar_du_kms.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
> index 2dc9caee8767..0d59f390de19 100644
> --- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c
> +++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
> @@ -585,7 +585,11 @@ static int rcar_du_vsps_init(struct rcar_du_device *rcdu)
> 
>  		vsps[j].crtcs_mask |= BIT(i);
> 
> -		/* Store the VSP pointer and pipe index in the CRTC. */
> +		/*
> +		 * Store the VSP pointer and pipe index in the CRTC. If the
> +		 * second cell of the 'vsps' specifier isn't present, default
> +		 * to 0 to remain compatible with older DT bindings.
> +		 */
>  		rcdu->crtcs[i].vsp = &rcdu->vsps[j];
>  		rcdu->crtcs[i].vsp_pipe = cells >= 1 ? args.args[0] : 0;
>  	}

-- 
Regards,

Laurent Pinchart

Re: [PATCH v2 2/2] drm: rcar-du: kms: Expand comment in vsps parsing routine

[Jacopo Mondi]

[-- Attachment #1: Type: text/plain, Size: 1878 bytes --]

Hi Laurent,

On Sun, Aug 25, 2019 at 09:06:03PM +0300, Laurent Pinchart wrote:
> Hi Jacopo,
>
> Thank you for the patch.
>
> How about changing the subject to "drm: rcar-du: Document DT backward
> compatibility" ?
>
> On Sun, Aug 25, 2019 at 04:01:35PM +0200, Jacopo Mondi wrote:
> > Exand comment in the 'vsps' parsing routine to specify why the LIF
>
> s/Exand/Expand/
>
> > channel index is defaulted to 0 in case the second cell of the property
>
> s/is defaulted to 0/defaults to 0/
>
> > is not specified.
>
> You could explain it here too :-)
>

Expand comment in the 'vsps' parsing routine to specify the LIF
channel index defaults to 0 in case the second cell of the property
is not specified to remain compatible with older DT bindings.

Could you take this in when applying this patch or want me to resend?

Thanks
  j


> > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
> > ---
> >  drivers/gpu/drm/rcar-du/rcar_du_kms.c | 6 +++++-
> >  1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
> > index 2dc9caee8767..0d59f390de19 100644
> > --- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c
> > +++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
> > @@ -585,7 +585,11 @@ static int rcar_du_vsps_init(struct rcar_du_device *rcdu)
> >
> >  		vsps[j].crtcs_mask |= BIT(i);
> >
> > -		/* Store the VSP pointer and pipe index in the CRTC. */
> > +		/*
> > +		 * Store the VSP pointer and pipe index in the CRTC. If the
> > +		 * second cell of the 'vsps' specifier isn't present, default
> > +		 * to 0 to remain compatible with older DT bindings.
> > +		 */
> >  		rcdu->crtcs[i].vsp = &rcdu->vsps[j];
> >  		rcdu->crtcs[i].vsp_pipe = cells >= 1 ? args.args[0] : 0;
> >  	}
>
> --
> Regards,
>
> Laurent Pinchart

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

Re: [PATCH v2 1/2] arm64: dts: renesas: Add LIF channel indices to vsps property

[Geert Uytterhoeven]

On Sun, Aug 25, 2019 at 4:00 PM Jacopo Mondi <jacopo+renesas@jmondi.org> wrote:
> According to the Renesas R-Car DU bindings documentation, the 'vsps'
> property should be composed of a phandle to the VSP instance and the
> index of the LIF channel assigned to the DU channel. Some SoC device
> tree source files do not specify any LIF channel index, relying on the
> driver defaulting it to 0 if not specified.
>
> Align all device tree files by specifying the LIF channel index as
> prescribed by the bindings documentation.
>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
i.e. will queue in renesas-devel for v5.5.

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 v2 2/2] drm: rcar-du: kms: Expand comment in vsps parsing routine

[Laurent Pinchart]

Hi Jacopo,

On Mon, Aug 26, 2019 at 09:23:30AM +0200, Jacopo Mondi wrote:
> On Sun, Aug 25, 2019 at 09:06:03PM +0300, Laurent Pinchart wrote:
> > Hi Jacopo,
> >
> > Thank you for the patch.
> >
> > How about changing the subject to "drm: rcar-du: Document DT backward
> > compatibility" ?
> >
> > On Sun, Aug 25, 2019 at 04:01:35PM +0200, Jacopo Mondi wrote:
> >> Exand comment in the 'vsps' parsing routine to specify why the LIF
> >
> > s/Exand/Expand/
> >
> >> channel index is defaulted to 0 in case the second cell of the property
> >
> > s/is defaulted to 0/defaults to 0/
> >
> >> is not specified.
> >
> > You could explain it here too :-)
> 
> Expand comment in the 'vsps' parsing routine to specify the LIF
> channel index defaults to 0 in case the second cell of the property
> is not specified to remain compatible with older DT bindings.
> 
> Could you take this in when applying this patch or want me to resend?

I would have, but you have forgotten to CC the dri-devel mailing list
I'm afraid. Could you post a v3 of this patch to the list ? I'll then
pick it up.

> >> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> >> Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
> >> ---
> >>  drivers/gpu/drm/rcar-du/rcar_du_kms.c | 6 +++++-
> >>  1 file changed, 5 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
> >> index 2dc9caee8767..0d59f390de19 100644
> >> --- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c
> >> +++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
> >> @@ -585,7 +585,11 @@ static int rcar_du_vsps_init(struct rcar_du_device *rcdu)
> >>
> >>  		vsps[j].crtcs_mask |= BIT(i);
> >>
> >> -		/* Store the VSP pointer and pipe index in the CRTC. */
> >> +		/*
> >> +		 * Store the VSP pointer and pipe index in the CRTC. If the
> >> +		 * second cell of the 'vsps' specifier isn't present, default
> >> +		 * to 0 to remain compatible with older DT bindings.
> >> +		 */
> >>  		rcdu->crtcs[i].vsp = &rcdu->vsps[j];
> >>  		rcdu->crtcs[i].vsp_pipe = cells >= 1 ? args.args[0] : 0;
> >>  	}

-- 
Regards,

Laurent Pinchart