[PATCH 1/2] dt-bindings: display: bridge: icn6211: Add support for RGB/BGR swap

[PATCH 1/2] dt-bindings: display: bridge: icn6211: Add support for RGB/BGR swap

[Marek Vasut]

The ICN6211 is capable of swapping the output DPI RGB/BGR color channels,
document a DT property to select this swap in DT. This can be useful on
hardware where such swap happens.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Jagan Teki <jagan@amarulasolutions.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Rob Herring <robh@kernel.org>
Cc: Robert Foss <robert.foss@linaro.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: dri-devel@lists.freedesktop.org
Cc: devicetree@vger.kernel.org
---
 .../devicetree/bindings/display/bridge/chipone,icn6211.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml b/Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml
index 18563ebed1a96..e721dd76e6640 100644
--- a/Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml
+++ b/Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml
@@ -33,6 +33,12 @@ properties:
         Optional external clock connected to REF_CLK input.
         The clock rate must be in 10..154 MHz range.
 
+  blue-and-red-swap:
+    description:
+      If defined, the DPI output blue and red channels are swapped,
+      i.e. RGB becomes BGR.
+    type: boolean
+
   enable-gpios:
     description: Bridge EN pin, chip is reset when EN is low.
 
-- 
2.35.1

[PATCH 1/2] dt-bindings: display: bridge: icn6211: Add support for RGB/BGR swap

[Marek Vasut]

The ICN6211 is capable of swapping the output DPI RGB/BGR color channels,
document a DT property to select this swap in DT. This can be useful on
hardware where such swap happens.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Jagan Teki <jagan@amarulasolutions.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Rob Herring <robh@kernel.org>
Cc: Robert Foss <robert.foss@linaro.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: dri-devel@lists.freedesktop.org
Cc: devicetree@vger.kernel.org
---
 .../devicetree/bindings/display/bridge/chipone,icn6211.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml b/Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml
index 18563ebed1a96..e721dd76e6640 100644
--- a/Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml
+++ b/Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml
@@ -33,6 +33,12 @@ properties:
         Optional external clock connected to REF_CLK input.
         The clock rate must be in 10..154 MHz range.
 
+  blue-and-red-swap:
+    description:
+      If defined, the DPI output blue and red channels are swapped,
+      i.e. RGB becomes BGR.
+    type: boolean
+
   enable-gpios:
     description: Bridge EN pin, chip is reset when EN is low.
 
-- 
2.35.1

[PATCH 2/2] drm: bridge: icn6211: Add support for RGB/BGR swap

[Marek Vasut]

The ICN6211 is capable of swapping the output DPI RGB/BGR color channels,
implement support for this and add DT property "blue-and-red-swap" to
select the RGB/BGR channel order.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Jagan Teki <jagan@amarulasolutions.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Robert Foss <robert.foss@linaro.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: dri-devel@lists.freedesktop.org
---
 drivers/gpu/drm/bridge/chipone-icn6211.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/bridge/chipone-icn6211.c b/drivers/gpu/drm/bridge/chipone-icn6211.c
index 7ee1858bab321..7d64172373a35 100644
--- a/drivers/gpu/drm/bridge/chipone-icn6211.c
+++ b/drivers/gpu/drm/bridge/chipone-icn6211.c
@@ -30,6 +30,8 @@
 #define PD_CTRL(n)		(0x0a + ((n) & 0x3)) /* 0..3 */
 #define RST_CTRL(n)		(0x0e + ((n) & 0x1)) /* 0..1 */
 #define SYS_CTRL(n)		(0x10 + ((n) & 0x7)) /* 0..4 */
+#define SYS_CTRL_0_COLOR_ORDER_RGB	0x0
+#define SYS_CTRL_0_COLOR_ORDER_BGR	0x5
 #define SYS_CTRL_1_CLK_PHASE_MSK	GENMASK(5, 4)
 #define CLK_PHASE_0			0
 #define CLK_PHASE_1_4			1
@@ -155,6 +157,7 @@ struct chipone {
 	struct clk *refclk;
 	unsigned long refclk_rate;
 	bool interface_i2c;
+	bool color_swap;
 };
 
 static const struct regmap_range chipone_dsi_readable_ranges[] = {
@@ -426,7 +429,9 @@ static void chipone_atomic_enable(struct drm_bridge *bridge,
 	/* Configure PLL settings */
 	chipone_configure_pll(icn, mode);
 
-	chipone_writeb(icn, SYS_CTRL(0), 0x40);
+	chipone_writeb(icn, SYS_CTRL(0), 0x40 |
+		       (icn->color_swap ? SYS_CTRL_0_COLOR_ORDER_BGR :
+					  SYS_CTRL_0_COLOR_ORDER_RGB));
 	sys_ctrl_1 = 0x88;
 
 	if (bus_flags & DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE)
@@ -680,6 +685,9 @@ static int chipone_parse_dt(struct chipone *icn)
 		return PTR_ERR(icn->enable_gpio);
 	}
 
+	icn->color_swap = of_property_read_bool(dev->of_node,
+						"blue-and-red-swap");
+
 	icn->panel_bridge = devm_drm_of_get_bridge(dev, dev->of_node, 1, 0);
 	if (IS_ERR(icn->panel_bridge))
 		return PTR_ERR(icn->panel_bridge);
-- 
2.35.1

Re: [PATCH 1/2] dt-bindings: display: bridge: icn6211: Add support for RGB/BGR swap

[Rob Herring]

On Mon, Aug 01, 2022 at 03:19:00PM +0200, Marek Vasut wrote:
> The ICN6211 is capable of swapping the output DPI RGB/BGR color channels,
> document a DT property to select this swap in DT. This can be useful on
> hardware where such swap happens.

We should ensure this series[1] works for you instead.


> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Jagan Teki <jagan@amarulasolutions.com>
> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Rob Herring <robh@kernel.org>
> Cc: Robert Foss <robert.foss@linaro.org>
> Cc: Sam Ravnborg <sam@ravnborg.org>
> Cc: dri-devel@lists.freedesktop.org
> Cc: devicetree@vger.kernel.org
> ---
>  .../devicetree/bindings/display/bridge/chipone,icn6211.yaml | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml b/Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml
> index 18563ebed1a96..e721dd76e6640 100644
> --- a/Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml
> +++ b/Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml
> @@ -33,6 +33,12 @@ properties:
>          Optional external clock connected to REF_CLK input.
>          The clock rate must be in 10..154 MHz range.
>  
> +  blue-and-red-swap:

'swap' assumes I know the default order and I don't. Better to make the 
property name describe the end result. ('invert' properties have the 
same issue)

> +    description:
> +      If defined, the DPI output blue and red channels are swapped,
> +      i.e. RGB becomes BGR.
> +    type: boolean
> +
>    enable-gpios:
>      description: Bridge EN pin, chip is reset when EN is low.

Rob

[1] https://lore.kernel.org/r/20220628181838.2031-3-max.oss.09@gmail.com

Re: [PATCH 1/2] dt-bindings: display: bridge: icn6211: Add support for RGB/BGR swap

[Rob Herring]

On Mon, Aug 01, 2022 at 03:19:00PM +0200, Marek Vasut wrote:
> The ICN6211 is capable of swapping the output DPI RGB/BGR color channels,
> document a DT property to select this swap in DT. This can be useful on
> hardware where such swap happens.

We should ensure this series[1] works for you instead.


> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Jagan Teki <jagan@amarulasolutions.com>
> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: Rob Herring <robh@kernel.org>
> Cc: Robert Foss <robert.foss@linaro.org>
> Cc: Sam Ravnborg <sam@ravnborg.org>
> Cc: dri-devel@lists.freedesktop.org
> Cc: devicetree@vger.kernel.org
> ---
>  .../devicetree/bindings/display/bridge/chipone,icn6211.yaml | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml b/Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml
> index 18563ebed1a96..e721dd76e6640 100644
> --- a/Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml
> +++ b/Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml
> @@ -33,6 +33,12 @@ properties:
>          Optional external clock connected to REF_CLK input.
>          The clock rate must be in 10..154 MHz range.
>  
> +  blue-and-red-swap:

'swap' assumes I know the default order and I don't. Better to make the 
property name describe the end result. ('invert' properties have the 
same issue)

> +    description:
> +      If defined, the DPI output blue and red channels are swapped,
> +      i.e. RGB becomes BGR.
> +    type: boolean
> +
>    enable-gpios:
>      description: Bridge EN pin, chip is reset when EN is low.

Rob

[1] https://lore.kernel.org/r/20220628181838.2031-3-max.oss.09@gmail.com

Re: [PATCH 1/2] dt-bindings: display: bridge: icn6211: Add support for RGB/BGR swap

[Marek Vasut]

On 8/1/22 18:32, Rob Herring wrote:
> On Mon, Aug 01, 2022 at 03:19:00PM +0200, Marek Vasut wrote:
>> The ICN6211 is capable of swapping the output DPI RGB/BGR color channels,
>> document a DT property to select this swap in DT. This can be useful on
>> hardware where such swap happens.
> 
> We should ensure this series[1] works for you instead.

[...]

> Rob
> 
> [1] https://lore.kernel.org/r/20220628181838.2031-3-max.oss.09@gmail.com

I'm still not convinced that we should encode this pixel format value 
directly into the DT instead of trying to describe the DPI bus color 
channel width/order/shift in the DT instead. I think I mentioned that 
before in one of the previous versions of that series.

Re: [PATCH 1/2] dt-bindings: display: bridge: icn6211: Add support for RGB/BGR swap

[Marek Vasut]

On 8/1/22 18:32, Rob Herring wrote:
> On Mon, Aug 01, 2022 at 03:19:00PM +0200, Marek Vasut wrote:
>> The ICN6211 is capable of swapping the output DPI RGB/BGR color channels,
>> document a DT property to select this swap in DT. This can be useful on
>> hardware where such swap happens.
> 
> We should ensure this series[1] works for you instead.

[...]

> Rob
> 
> [1] https://lore.kernel.org/r/20220628181838.2031-3-max.oss.09@gmail.com

I'm still not convinced that we should encode this pixel format value 
directly into the DT instead of trying to describe the DPI bus color 
channel width/order/shift in the DT instead. I think I mentioned that 
before in one of the previous versions of that series.

Re: [PATCH 1/2] dt-bindings: display: bridge: icn6211: Add support for RGB/BGR swap

[Rob Herring]

On Tue, Aug 2, 2022 at 5:33 AM Marek Vasut <marex@denx.de> wrote:
>
> On 8/1/22 18:32, Rob Herring wrote:
> > On Mon, Aug 01, 2022 at 03:19:00PM +0200, Marek Vasut wrote:
> >> The ICN6211 is capable of swapping the output DPI RGB/BGR color channels,
> >> document a DT property to select this swap in DT. This can be useful on
> >> hardware where such swap happens.
> >
> > We should ensure this series[1] works for you instead.
>
> [...]
>
> > Rob
> >
> > [1] https://lore.kernel.org/r/20220628181838.2031-3-max.oss.09@gmail.com
>
> I'm still not convinced that we should encode this pixel format value
> directly into the DT instead of trying to describe the DPI bus color
> channel width/order/shift in the DT instead. I think I mentioned that
> before in one of the previous versions of that series.

I worry that it gets pretty verbose, but worth having the discussion.
In any case, let's have that discussion and not add yet another one
off property.

Rob

Re: [PATCH 1/2] dt-bindings: display: bridge: icn6211: Add support for RGB/BGR swap

[Rob Herring]

On Tue, Aug 2, 2022 at 5:33 AM Marek Vasut <marex@denx.de> wrote:
>
> On 8/1/22 18:32, Rob Herring wrote:
> > On Mon, Aug 01, 2022 at 03:19:00PM +0200, Marek Vasut wrote:
> >> The ICN6211 is capable of swapping the output DPI RGB/BGR color channels,
> >> document a DT property to select this swap in DT. This can be useful on
> >> hardware where such swap happens.
> >
> > We should ensure this series[1] works for you instead.
>
> [...]
>
> > Rob
> >
> > [1] https://lore.kernel.org/r/20220628181838.2031-3-max.oss.09@gmail.com
>
> I'm still not convinced that we should encode this pixel format value
> directly into the DT instead of trying to describe the DPI bus color
> channel width/order/shift in the DT instead. I think I mentioned that
> before in one of the previous versions of that series.

I worry that it gets pretty verbose, but worth having the discussion.
In any case, let's have that discussion and not add yet another one
off property.

Rob

Re: [PATCH 1/2] dt-bindings: display: bridge: icn6211: Add support for RGB/BGR swap

[Marek Vasut]

On 8/4/22 00:41, Rob Herring wrote:
> On Tue, Aug 2, 2022 at 5:33 AM Marek Vasut <marex@denx.de> wrote:
>>
>> On 8/1/22 18:32, Rob Herring wrote:
>>> On Mon, Aug 01, 2022 at 03:19:00PM +0200, Marek Vasut wrote:
>>>> The ICN6211 is capable of swapping the output DPI RGB/BGR color channels,
>>>> document a DT property to select this swap in DT. This can be useful on
>>>> hardware where such swap happens.
>>>
>>> We should ensure this series[1] works for you instead.
>>
>> [...]
>>
>>> Rob
>>>
>>> [1] https://lore.kernel.org/r/20220628181838.2031-3-max.oss.09@gmail.com
>>
>> I'm still not convinced that we should encode this pixel format value
>> directly into the DT instead of trying to describe the DPI bus color
>> channel width/order/shift in the DT instead. I think I mentioned that
>> before in one of the previous versions of that series.
> 
> I worry that it gets pretty verbose, but worth having the discussion.
> In any case, let's have that discussion and not add yet another one
> off property.

Done, I replied

Re: [PATCH 1/2] dt-bindings: display: bridge: icn6211: Add support for RGB/BGR swap

[Marek Vasut]

On 8/4/22 00:41, Rob Herring wrote:
> On Tue, Aug 2, 2022 at 5:33 AM Marek Vasut <marex@denx.de> wrote:
>>
>> On 8/1/22 18:32, Rob Herring wrote:
>>> On Mon, Aug 01, 2022 at 03:19:00PM +0200, Marek Vasut wrote:
>>>> The ICN6211 is capable of swapping the output DPI RGB/BGR color channels,
>>>> document a DT property to select this swap in DT. This can be useful on
>>>> hardware where such swap happens.
>>>
>>> We should ensure this series[1] works for you instead.
>>
>> [...]
>>
>>> Rob
>>>
>>> [1] https://lore.kernel.org/r/20220628181838.2031-3-max.oss.09@gmail.com
>>
>> I'm still not convinced that we should encode this pixel format value
>> directly into the DT instead of trying to describe the DPI bus color
>> channel width/order/shift in the DT instead. I think I mentioned that
>> before in one of the previous versions of that series.
> 
> I worry that it gets pretty verbose, but worth having the discussion.
> In any case, let's have that discussion and not add yet another one
> off property.

Done, I replied

Re: [PATCH 1/2] dt-bindings: display: bridge: icn6211: Add support for RGB/BGR swap

[Linus Walleij]

On Mon, Aug 8, 2022 at 3:57 AM Marek Vasut <marex@denx.de> wrote:
> On 8/4/22 00:41, Rob Herring wrote:
> > On Tue, Aug 2, 2022 at 5:33 AM Marek Vasut <marex@denx.de> wrote:
> >>
> >> On 8/1/22 18:32, Rob Herring wrote:
> >>> On Mon, Aug 01, 2022 at 03:19:00PM +0200, Marek Vasut wrote:
> >>>> The ICN6211 is capable of swapping the output DPI RGB/BGR color channels,
> >>>> document a DT property to select this swap in DT. This can be useful on
> >>>> hardware where such swap happens.
> >>>
> >>> We should ensure this series[1] works for you instead.
> >>
> >> [...]
> >>
> >>> Rob
> >>>
> >>> [1] https://lore.kernel.org/r/20220628181838.2031-3-max.oss.09@gmail.com
> >>
> >> I'm still not convinced that we should encode this pixel format value
> >> directly into the DT instead of trying to describe the DPI bus color
> >> channel width/order/shift in the DT instead. I think I mentioned that
> >> before in one of the previous versions of that series.
> >
> > I worry that it gets pretty verbose, but worth having the discussion.
> > In any case, let's have that discussion and not add yet another one
> > off property.
>
> Done, I replied

So what is the verdict? Is this patch set dropped or shall it be
applied?

Yours,
Linus Walleij

Re: [PATCH 1/2] dt-bindings: display: bridge: icn6211: Add support for RGB/BGR swap

[Linus Walleij]

On Mon, Aug 8, 2022 at 3:57 AM Marek Vasut <marex@denx.de> wrote:
> On 8/4/22 00:41, Rob Herring wrote:
> > On Tue, Aug 2, 2022 at 5:33 AM Marek Vasut <marex@denx.de> wrote:
> >>
> >> On 8/1/22 18:32, Rob Herring wrote:
> >>> On Mon, Aug 01, 2022 at 03:19:00PM +0200, Marek Vasut wrote:
> >>>> The ICN6211 is capable of swapping the output DPI RGB/BGR color channels,
> >>>> document a DT property to select this swap in DT. This can be useful on
> >>>> hardware where such swap happens.
> >>>
> >>> We should ensure this series[1] works for you instead.
> >>
> >> [...]
> >>
> >>> Rob
> >>>
> >>> [1] https://lore.kernel.org/r/20220628181838.2031-3-max.oss.09@gmail.com
> >>
> >> I'm still not convinced that we should encode this pixel format value
> >> directly into the DT instead of trying to describe the DPI bus color
> >> channel width/order/shift in the DT instead. I think I mentioned that
> >> before in one of the previous versions of that series.
> >
> > I worry that it gets pretty verbose, but worth having the discussion.
> > In any case, let's have that discussion and not add yet another one
> > off property.
>
> Done, I replied

So what is the verdict? Is this patch set dropped or shall it be
applied?

Yours,
Linus Walleij

Re: [PATCH 1/2] dt-bindings: display: bridge: icn6211: Add support for RGB/BGR swap

[Marek Vasut]

On 8/26/22 13:52, Linus Walleij wrote:
> On Mon, Aug 8, 2022 at 3:57 AM Marek Vasut <marex@denx.de> wrote:
>> On 8/4/22 00:41, Rob Herring wrote:
>>> On Tue, Aug 2, 2022 at 5:33 AM Marek Vasut <marex@denx.de> wrote:
>>>>
>>>> On 8/1/22 18:32, Rob Herring wrote:
>>>>> On Mon, Aug 01, 2022 at 03:19:00PM +0200, Marek Vasut wrote:
>>>>>> The ICN6211 is capable of swapping the output DPI RGB/BGR color channels,
>>>>>> document a DT property to select this swap in DT. This can be useful on
>>>>>> hardware where such swap happens.
>>>>>
>>>>> We should ensure this series[1] works for you instead.
>>>>
>>>> [...]
>>>>
>>>>> Rob
>>>>>
>>>>> [1] https://lore.kernel.org/r/20220628181838.2031-3-max.oss.09@gmail.com
>>>>
>>>> I'm still not convinced that we should encode this pixel format value
>>>> directly into the DT instead of trying to describe the DPI bus color
>>>> channel width/order/shift in the DT instead. I think I mentioned that
>>>> before in one of the previous versions of that series.
>>>
>>> I worry that it gets pretty verbose, but worth having the discussion.
>>> In any case, let's have that discussion and not add yet another one
>>> off property.
>>
>> Done, I replied
> 
> So what is the verdict? Is this patch set dropped or shall it be
> applied?

Drop

Let's wait for the DPI pixel format description discussion in DT gets 
sorted out.

Re: [PATCH 1/2] dt-bindings: display: bridge: icn6211: Add support for RGB/BGR swap

[Marek Vasut]

On 8/26/22 13:52, Linus Walleij wrote:
> On Mon, Aug 8, 2022 at 3:57 AM Marek Vasut <marex@denx.de> wrote:
>> On 8/4/22 00:41, Rob Herring wrote:
>>> On Tue, Aug 2, 2022 at 5:33 AM Marek Vasut <marex@denx.de> wrote:
>>>>
>>>> On 8/1/22 18:32, Rob Herring wrote:
>>>>> On Mon, Aug 01, 2022 at 03:19:00PM +0200, Marek Vasut wrote:
>>>>>> The ICN6211 is capable of swapping the output DPI RGB/BGR color channels,
>>>>>> document a DT property to select this swap in DT. This can be useful on
>>>>>> hardware where such swap happens.
>>>>>
>>>>> We should ensure this series[1] works for you instead.
>>>>
>>>> [...]
>>>>
>>>>> Rob
>>>>>
>>>>> [1] https://lore.kernel.org/r/20220628181838.2031-3-max.oss.09@gmail.com
>>>>
>>>> I'm still not convinced that we should encode this pixel format value
>>>> directly into the DT instead of trying to describe the DPI bus color
>>>> channel width/order/shift in the DT instead. I think I mentioned that
>>>> before in one of the previous versions of that series.
>>>
>>> I worry that it gets pretty verbose, but worth having the discussion.
>>> In any case, let's have that discussion and not add yet another one
>>> off property.
>>
>> Done, I replied
> 
> So what is the verdict? Is this patch set dropped or shall it be
> applied?

Drop

Let's wait for the DPI pixel format description discussion in DT gets 
sorted out.