* [PATCH v15 1/7] drm/ingenic: Fix support for JZ4780 HDMI output
2022-02-12 15:50 [PATCH v15 0/7] MIPS: JZ4780 and CI20 HDMI H. Nikolaus Schaller
@ 2022-02-12 15:50 ` H. Nikolaus Schaller
2022-02-14 10:13 ` Paul Cercueil
2022-02-12 15:50 ` [PATCH v15 2/7] drm/ingenic: Add dw-hdmi driver specialization for jz4780 H. Nikolaus Schaller
` (5 subsequent siblings)
6 siblings, 1 reply; 20+ messages in thread
From: H. Nikolaus Schaller @ 2022-02-12 15:50 UTC (permalink / raw)
To: Andrzej Hajda, Neil Armstrong, Robert Foss, Paul Boddie,
Laurent Pinchart, Jernej Skrabec, David Airlie, Daniel Vetter,
Paul Cercueil, Maxime Ripard, Harry Wentland,
H. Nikolaus Schaller, Kieran Bingham
Cc: Jonas Karlman, linux-kernel, dri-devel, linux-mips, letux-kernel,
Ezequiel Garcia
From: Paul Boddie <paul@boddie.org.uk>
We have to make sure that
- JZ_LCD_OSDC_ALPHAEN is set
- plane f0 is disabled and not seen from user-space
Tested on MIPS Creator CI20 board.
Signed-off-by: Paul Boddie <paul@boddie.org.uk>
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
index 7f10d6eed549d..dcf44cb00821f 100644
--- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
+++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
@@ -65,8 +65,10 @@ struct ingenic_dma_hwdescs {
struct jz_soc_info {
bool needs_dev_clk;
bool has_osd;
+ bool has_alpha;
bool map_noncoherent;
bool use_extended_hwdesc;
+ bool plane_f0_not_working;
unsigned int max_width, max_height;
const u32 *formats_f0, *formats_f1;
unsigned int num_formats_f0, num_formats_f1;
@@ -453,7 +455,7 @@ static int ingenic_drm_plane_atomic_check(struct drm_plane *plane,
if (!crtc)
return 0;
- if (plane == &priv->f0)
+ if (priv->soc_info->plane_f0_not_working && plane == &priv->f0)
return -EINVAL;
crtc_state = drm_atomic_get_existing_crtc_state(state,
@@ -1055,6 +1057,7 @@ static int ingenic_drm_bind(struct device *dev, bool has_components)
long parent_rate;
unsigned int i, clone_mask = 0;
int ret, irq;
+ u32 osdc = 0;
soc_info = of_device_get_match_data(dev);
if (!soc_info) {
@@ -1312,7 +1315,10 @@ static int ingenic_drm_bind(struct device *dev, bool has_components)
/* Enable OSD if available */
if (soc_info->has_osd)
- regmap_write(priv->map, JZ_REG_LCD_OSDC, JZ_LCD_OSDC_OSDEN);
+ osdc |= JZ_LCD_OSDC_OSDEN;
+ if (soc_info->has_alpha)
+ osdc |= JZ_LCD_OSDC_ALPHAEN;
+ regmap_write(priv->map, JZ_REG_LCD_OSDC, osdc);
mutex_init(&priv->clk_mutex);
priv->clock_nb.notifier_call = ingenic_drm_update_pixclk;
@@ -1511,7 +1517,9 @@ static const struct jz_soc_info jz4770_soc_info = {
static const struct jz_soc_info jz4780_soc_info = {
.needs_dev_clk = true,
.has_osd = true,
+ .has_alpha = true,
.use_extended_hwdesc = true,
+ .plane_f0_not_working = true, /* REVISIT */
.max_width = 4096,
.max_height = 2048,
.formats_f1 = jz4770_formats_f1,
--
2.33.0
^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH v15 1/7] drm/ingenic: Fix support for JZ4780 HDMI output
2022-02-12 15:50 ` [PATCH v15 1/7] drm/ingenic: Fix support for JZ4780 HDMI output H. Nikolaus Schaller
@ 2022-02-14 10:13 ` Paul Cercueil
2022-02-14 10:19 ` H. Nikolaus Schaller
0 siblings, 1 reply; 20+ messages in thread
From: Paul Cercueil @ 2022-02-14 10:13 UTC (permalink / raw)
To: H. Nikolaus Schaller
Cc: Andrzej Hajda, Neil Armstrong, Robert Foss, Paul Boddie,
Laurent Pinchart, Jernej Skrabec, David Airlie, Daniel Vetter,
Maxime Ripard, Harry Wentland, Kieran Bingham, Jonas Karlman,
linux-kernel, dri-devel, linux-mips, letux-kernel,
Ezequiel Garcia
Hi,
Le sam., févr. 12 2022 at 16:50:49 +0100, H. Nikolaus Schaller
<hns@goldelico.com> a écrit :
> From: Paul Boddie <paul@boddie.org.uk>
>
> We have to make sure that
> - JZ_LCD_OSDC_ALPHAEN is set
> - plane f0 is disabled and not seen from user-space
Actually it will still be seen from user-space, but it won't be
possible to use it. So before applying I'll change this to:
"plane f0 is disabled as it's not working yet"
If that's OK with you.
Cheers,
-Paul
>
> Tested on MIPS Creator CI20 board.
>
> Signed-off-by: Paul Boddie <paul@boddie.org.uk>
> Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
> Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
> ---
> drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
> b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
> index 7f10d6eed549d..dcf44cb00821f 100644
> --- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
> +++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
> @@ -65,8 +65,10 @@ struct ingenic_dma_hwdescs {
> struct jz_soc_info {
> bool needs_dev_clk;
> bool has_osd;
> + bool has_alpha;
> bool map_noncoherent;
> bool use_extended_hwdesc;
> + bool plane_f0_not_working;
> unsigned int max_width, max_height;
> const u32 *formats_f0, *formats_f1;
> unsigned int num_formats_f0, num_formats_f1;
> @@ -453,7 +455,7 @@ static int ingenic_drm_plane_atomic_check(struct
> drm_plane *plane,
> if (!crtc)
> return 0;
>
> - if (plane == &priv->f0)
> + if (priv->soc_info->plane_f0_not_working && plane == &priv->f0)
> return -EINVAL;
>
> crtc_state = drm_atomic_get_existing_crtc_state(state,
> @@ -1055,6 +1057,7 @@ static int ingenic_drm_bind(struct device *dev,
> bool has_components)
> long parent_rate;
> unsigned int i, clone_mask = 0;
> int ret, irq;
> + u32 osdc = 0;
>
> soc_info = of_device_get_match_data(dev);
> if (!soc_info) {
> @@ -1312,7 +1315,10 @@ static int ingenic_drm_bind(struct device
> *dev, bool has_components)
>
> /* Enable OSD if available */
> if (soc_info->has_osd)
> - regmap_write(priv->map, JZ_REG_LCD_OSDC, JZ_LCD_OSDC_OSDEN);
> + osdc |= JZ_LCD_OSDC_OSDEN;
> + if (soc_info->has_alpha)
> + osdc |= JZ_LCD_OSDC_ALPHAEN;
> + regmap_write(priv->map, JZ_REG_LCD_OSDC, osdc);
>
> mutex_init(&priv->clk_mutex);
> priv->clock_nb.notifier_call = ingenic_drm_update_pixclk;
> @@ -1511,7 +1517,9 @@ static const struct jz_soc_info jz4770_soc_info
> = {
> static const struct jz_soc_info jz4780_soc_info = {
> .needs_dev_clk = true,
> .has_osd = true,
> + .has_alpha = true,
> .use_extended_hwdesc = true,
> + .plane_f0_not_working = true, /* REVISIT */
> .max_width = 4096,
> .max_height = 2048,
> .formats_f1 = jz4770_formats_f1,
> --
> 2.33.0
>
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v15 1/7] drm/ingenic: Fix support for JZ4780 HDMI output
2022-02-14 10:13 ` Paul Cercueil
@ 2022-02-14 10:19 ` H. Nikolaus Schaller
2022-02-14 12:29 ` Paul Cercueil
0 siblings, 1 reply; 20+ messages in thread
From: H. Nikolaus Schaller @ 2022-02-14 10:19 UTC (permalink / raw)
To: Paul Cercueil
Cc: Andrzej Hajda, Neil Armstrong, Robert Foss, Paul Boddie,
Laurent Pinchart, Jernej Skrabec, David Airlie, Daniel Vetter,
Maxime Ripard, Harry Wentland, Kieran Bingham, Jonas Karlman,
linux-kernel, dri-devel, linux-mips, letux-kernel,
Ezequiel Garcia
Hi Paul,
> Am 14.02.2022 um 11:13 schrieb Paul Cercueil <paul@crapouillou.net>:
>
> Hi,
>
> Le sam., févr. 12 2022 at 16:50:49 +0100, H. Nikolaus Schaller <hns@goldelico.com> a écrit :
>> From: Paul Boddie <paul@boddie.org.uk>
>> We have to make sure that
>> - JZ_LCD_OSDC_ALPHAEN is set
>> - plane f0 is disabled and not seen from user-space
>
> Actually it will still be seen from user-space, but it won't be possible to use it. So before applying I'll change this to:
> "plane f0 is disabled as it's not working yet"
>
> If that's OK with you.
Yes. You understand much better than me the implications...
BR and thanks,
Nikolaus
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v15 1/7] drm/ingenic: Fix support for JZ4780 HDMI output
2022-02-14 10:19 ` H. Nikolaus Schaller
@ 2022-02-14 12:29 ` Paul Cercueil
2022-02-14 12:33 ` H. Nikolaus Schaller
0 siblings, 1 reply; 20+ messages in thread
From: Paul Cercueil @ 2022-02-14 12:29 UTC (permalink / raw)
To: H. Nikolaus Schaller
Cc: Andrzej Hajda, Neil Armstrong, Robert Foss, Paul Boddie,
Laurent Pinchart, Jernej Skrabec, David Airlie, Daniel Vetter,
Maxime Ripard, Harry Wentland, Kieran Bingham, Jonas Karlman,
linux-kernel, dri-devel, linux-mips, letux-kernel,
Ezequiel Garcia
Hi,
Le lun., févr. 14 2022 at 11:19:40 +0100, H. Nikolaus Schaller
<hns@goldelico.com> a écrit :
> Hi Paul,
>
>
>> Am 14.02.2022 um 11:13 schrieb Paul Cercueil <paul@crapouillou.net>:
>>
>> Hi,
>>
>> Le sam., févr. 12 2022 at 16:50:49 +0100, H. Nikolaus Schaller
>> <hns@goldelico.com> a écrit :
>>> From: Paul Boddie <paul@boddie.org.uk>
>>> We have to make sure that
>>> - JZ_LCD_OSDC_ALPHAEN is set
>>> - plane f0 is disabled and not seen from user-space
>>
>> Actually it will still be seen from user-space, but it won't be
>> possible to use it. So before applying I'll change this to:
>> "plane f0 is disabled as it's not working yet"
>>
>> If that's OK with you.
>
> Yes. You understand much better than me the implications...
I reworded it to "plane f0 is disabled as it's not working yet", added
a Fixes: tag, and pushed this patch to drm-misc-next.
Cheers,
-Paul
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v15 1/7] drm/ingenic: Fix support for JZ4780 HDMI output
2022-02-14 12:29 ` Paul Cercueil
@ 2022-02-14 12:33 ` H. Nikolaus Schaller
2022-02-14 12:36 ` Paul Cercueil
0 siblings, 1 reply; 20+ messages in thread
From: H. Nikolaus Schaller @ 2022-02-14 12:33 UTC (permalink / raw)
To: Paul Cercueil
Cc: Andrzej Hajda, Neil Armstrong, Robert Foss, Paul Boddie,
Laurent Pinchart, Jernej Skrabec, David Airlie, Daniel Vetter,
Maxime Ripard, Harry Wentland, Kieran Bingham, Jonas Karlman,
linux-kernel, dri-devel, linux-mips, letux-kernel,
Ezequiel Garcia
Hi Paul,
> Am 14.02.2022 um 13:29 schrieb Paul Cercueil <paul@crapouillou.net>:
>
> Hi,
>
> Le lun., févr. 14 2022 at 11:19:40 +0100, H. Nikolaus Schaller <hns@goldelico.com> a écrit :
>> Hi Paul,
>>> Am 14.02.2022 um 11:13 schrieb Paul Cercueil <paul@crapouillou.net>:
>>> Hi,
>>> Le sam., févr. 12 2022 at 16:50:49 +0100, H. Nikolaus Schaller <hns@goldelico.com> a écrit :
>>>> From: Paul Boddie <paul@boddie.org.uk>
>>>> We have to make sure that
>>>> - JZ_LCD_OSDC_ALPHAEN is set
>>>> - plane f0 is disabled and not seen from user-space
>>> Actually it will still be seen from user-space, but it won't be possible to use it. So before applying I'll change this to:
>>> "plane f0 is disabled as it's not working yet"
>>> If that's OK with you.
>> Yes. You understand much better than me the implications...
>
> I reworded it to "plane f0 is disabled as it's not working yet", added a Fixes: tag, and pushed this patch to drm-misc-next.
great and thanks.
So I drop it from v16.
BR and thanks,
Nikolaus
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v15 1/7] drm/ingenic: Fix support for JZ4780 HDMI output
2022-02-14 12:33 ` H. Nikolaus Schaller
@ 2022-02-14 12:36 ` Paul Cercueil
2022-02-14 13:10 ` H. Nikolaus Schaller
0 siblings, 1 reply; 20+ messages in thread
From: Paul Cercueil @ 2022-02-14 12:36 UTC (permalink / raw)
To: H. Nikolaus Schaller
Cc: Andrzej Hajda, Neil Armstrong, Robert Foss, Paul Boddie,
Laurent Pinchart, Jernej Skrabec, David Airlie, Daniel Vetter,
Maxime Ripard, Harry Wentland, Kieran Bingham, Jonas Karlman,
linux-kernel, dri-devel, linux-mips, letux-kernel,
Ezequiel Garcia
Hi,
Le lun., févr. 14 2022 at 13:33:25 +0100, H. Nikolaus Schaller
<hns@goldelico.com> a écrit :
> Hi Paul,
>
>> Am 14.02.2022 um 13:29 schrieb Paul Cercueil <paul@crapouillou.net>:
>>
>> Hi,
>>
>> Le lun., févr. 14 2022 at 11:19:40 +0100, H. Nikolaus Schaller
>> <hns@goldelico.com> a écrit :
>>> Hi Paul,
>>>> Am 14.02.2022 um 11:13 schrieb Paul Cercueil
>>>> <paul@crapouillou.net>:
>>>> Hi,
>>>> Le sam., févr. 12 2022 at 16:50:49 +0100, H. Nikolaus Schaller
>>>> <hns@goldelico.com> a écrit :
>>>>> From: Paul Boddie <paul@boddie.org.uk>
>>>>> We have to make sure that
>>>>> - JZ_LCD_OSDC_ALPHAEN is set
>>>>> - plane f0 is disabled and not seen from user-space
>>>> Actually it will still be seen from user-space, but it won't be
>>>> possible to use it. So before applying I'll change this to:
>>>> "plane f0 is disabled as it's not working yet"
>>>> If that's OK with you.
>>> Yes. You understand much better than me the implications...
>>
>> I reworded it to "plane f0 is disabled as it's not working yet",
>> added a Fixes: tag, and pushed this patch to drm-misc-next.
>
> great and thanks.
> So I drop it from v16.
Neil told me he'd review patch [4/7] this week so maybe hold off v16
for a few days.
Cheers,
-Paul
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v15 1/7] drm/ingenic: Fix support for JZ4780 HDMI output
2022-02-14 12:36 ` Paul Cercueil
@ 2022-02-14 13:10 ` H. Nikolaus Schaller
0 siblings, 0 replies; 20+ messages in thread
From: H. Nikolaus Schaller @ 2022-02-14 13:10 UTC (permalink / raw)
To: Paul Cercueil
Cc: Andrzej Hajda, Neil Armstrong, Robert Foss, Paul Boddie,
Laurent Pinchart, Jernej Skrabec, David Airlie, Daniel Vetter,
Maxime Ripard, Harry Wentland, Kieran Bingham, Jonas Karlman,
linux-kernel, dri-devel, linux-mips, letux-kernel,
Ezequiel Garcia
> Am 14.02.2022 um 13:36 schrieb Paul Cercueil <paul@crapouillou.net>:
>
> Hi,
>
> Le lun., févr. 14 2022 at 13:33:25 +0100, H. Nikolaus Schaller <hns@goldelico.com> a écrit :
>> Hi Paul,
>>> Am 14.02.2022 um 13:29 schrieb Paul Cercueil <paul@crapouillou.net>:
>>> Hi,
>>> Le lun., févr. 14 2022 at 11:19:40 +0100, H. Nikolaus Schaller <hns@goldelico.com> a écrit :
>>>> Hi Paul,
>>>>> Am 14.02.2022 um 11:13 schrieb Paul Cercueil <paul@crapouillou.net>:
>>>>> Hi,
>>>>> Le sam., févr. 12 2022 at 16:50:49 +0100, H. Nikolaus Schaller <hns@goldelico.com> a écrit :
>>>>>> From: Paul Boddie <paul@boddie.org.uk>
>>>>>> We have to make sure that
>>>>>> - JZ_LCD_OSDC_ALPHAEN is set
>>>>>> - plane f0 is disabled and not seen from user-space
>>>>> Actually it will still be seen from user-space, but it won't be possible to use it. So before applying I'll change this to:
>>>>> "plane f0 is disabled as it's not working yet"
>>>>> If that's OK with you.
>>>> Yes. You understand much better than me the implications...
>>> I reworded it to "plane f0 is disabled as it's not working yet", added a Fixes: tag, and pushed this patch to drm-misc-next.
>> great and thanks.
>> So I drop it from v16.
>
> Neil told me he'd review patch [4/7] this week so maybe hold off v16 for a few days.
Ok.
BR and thanks,
Nikolaus
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v15 2/7] drm/ingenic: Add dw-hdmi driver specialization for jz4780
2022-02-12 15:50 [PATCH v15 0/7] MIPS: JZ4780 and CI20 HDMI H. Nikolaus Schaller
2022-02-12 15:50 ` [PATCH v15 1/7] drm/ingenic: Fix support for JZ4780 HDMI output H. Nikolaus Schaller
@ 2022-02-12 15:50 ` H. Nikolaus Schaller
2022-02-14 10:24 ` Paul Cercueil
2022-02-12 15:50 ` [PATCH v15 3/7] drm/bridge: display-connector: add ddc-en gpio support H. Nikolaus Schaller
` (4 subsequent siblings)
6 siblings, 1 reply; 20+ messages in thread
From: H. Nikolaus Schaller @ 2022-02-12 15:50 UTC (permalink / raw)
To: Andrzej Hajda, Neil Armstrong, Robert Foss, Paul Boddie,
Laurent Pinchart, Jernej Skrabec, David Airlie, Daniel Vetter,
Paul Cercueil, Maxime Ripard, Harry Wentland,
H. Nikolaus Schaller, Kieran Bingham
Cc: Jonas Karlman, linux-kernel, dri-devel, linux-mips, letux-kernel,
Ezequiel Garcia
From: Paul Boddie <paul@boddie.org.uk>
A specialisation of the generic Synopsys HDMI driver is employed for
JZ4780 HDMI support. This requires a new driver, plus device tree and
configuration modifications.
Here we add Kconfig DRM_INGENIC_DW_HDMI, Makefile and driver code.
Signed-off-by: Paul Boddie <paul@boddie.org.uk>
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
drivers/gpu/drm/ingenic/Kconfig | 9 ++
drivers/gpu/drm/ingenic/Makefile | 1 +
drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c | 104 ++++++++++++++++++++++
3 files changed, 114 insertions(+)
create mode 100644 drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
diff --git a/drivers/gpu/drm/ingenic/Kconfig b/drivers/gpu/drm/ingenic/Kconfig
index 001f59fb06d56..090830bcbde7f 100644
--- a/drivers/gpu/drm/ingenic/Kconfig
+++ b/drivers/gpu/drm/ingenic/Kconfig
@@ -24,4 +24,13 @@ config DRM_INGENIC_IPU
The Image Processing Unit (IPU) will appear as a second primary plane.
+config DRM_INGENIC_DW_HDMI
+ tristate "Ingenic specific support for Synopsys DW HDMI"
+ depends on MACH_JZ4780
+ select DRM_DW_HDMI
+ help
+ Choose this option to enable Synopsys DesignWare HDMI based driver.
+ If you want to enable HDMI on Ingenic JZ4780 based SoC, you should
+ select this option.
+
endif
diff --git a/drivers/gpu/drm/ingenic/Makefile b/drivers/gpu/drm/ingenic/Makefile
index d313326bdddbb..f10cc1c5a5f22 100644
--- a/drivers/gpu/drm/ingenic/Makefile
+++ b/drivers/gpu/drm/ingenic/Makefile
@@ -1,3 +1,4 @@
obj-$(CONFIG_DRM_INGENIC) += ingenic-drm.o
ingenic-drm-y = ingenic-drm-drv.o
ingenic-drm-$(CONFIG_DRM_INGENIC_IPU) += ingenic-ipu.o
+obj-$(CONFIG_DRM_INGENIC_DW_HDMI) += ingenic-dw-hdmi.o
diff --git a/drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c b/drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
new file mode 100644
index 0000000000000..34e986dd606cf
--- /dev/null
+++ b/drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
@@ -0,0 +1,104 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (C) 2011-2013 Freescale Semiconductor, Inc.
+ * Copyright (C) 2019, 2020 Paul Boddie <paul@boddie.org.uk>
+ *
+ * Derived from dw_hdmi-imx.c with i.MX portions removed.
+ * Probe and remove operations derived from rcar_dw_hdmi.c.
+ */
+
+#include <linux/module.h>
+#include <linux/of_platform.h>
+#include <linux/platform_device.h>
+
+#include <drm/bridge/dw_hdmi.h>
+#include <drm/drm_of.h>
+#include <drm/drm_print.h>
+
+static const struct dw_hdmi_mpll_config ingenic_mpll_cfg[] = {
+ { 45250000, { { 0x01e0, 0x0000 }, { 0x21e1, 0x0000 }, { 0x41e2, 0x0000 } } },
+ { 92500000, { { 0x0140, 0x0005 }, { 0x2141, 0x0005 }, { 0x4142, 0x0005 } } },
+ { 148500000, { { 0x00a0, 0x000a }, { 0x20a1, 0x000a }, { 0x40a2, 0x000a } } },
+ { 216000000, { { 0x00a0, 0x000a }, { 0x2001, 0x000f }, { 0x4002, 0x000f } } },
+ { ~0UL, { { 0x0000, 0x0000 }, { 0x0000, 0x0000 }, { 0x0000, 0x0000 } } }
+};
+
+static const struct dw_hdmi_curr_ctrl ingenic_cur_ctr[] = {
+ /*pixelclk bpp8 bpp10 bpp12 */
+ { 54000000, { 0x091c, 0x091c, 0x06dc } },
+ { 58400000, { 0x091c, 0x06dc, 0x06dc } },
+ { 72000000, { 0x06dc, 0x06dc, 0x091c } },
+ { 74250000, { 0x06dc, 0x0b5c, 0x091c } },
+ { 118800000, { 0x091c, 0x091c, 0x06dc } },
+ { 216000000, { 0x06dc, 0x0b5c, 0x091c } },
+ { ~0UL, { 0x0000, 0x0000, 0x0000 } },
+};
+
+/*
+ * Resistance term 133Ohm Cfg
+ * PREEMP config 0.00
+ * TX/CK level 10
+ */
+static const struct dw_hdmi_phy_config ingenic_phy_config[] = {
+ /*pixelclk symbol term vlev */
+ { 216000000, 0x800d, 0x0005, 0x01ad},
+ { ~0UL, 0x0000, 0x0000, 0x0000}
+};
+
+static enum drm_mode_status
+ingenic_dw_hdmi_mode_valid(struct dw_hdmi *hdmi, void *data,
+ const struct drm_display_info *info,
+ const struct drm_display_mode *mode)
+{
+ if (mode->clock < 13500)
+ return MODE_CLOCK_LOW;
+ /* FIXME: Hardware is capable of 270MHz, but setup data is missing. */
+ if (mode->clock > 216000)
+ return MODE_CLOCK_HIGH;
+
+ return MODE_OK;
+}
+
+static struct dw_hdmi_plat_data ingenic_dw_hdmi_plat_data = {
+ .mpll_cfg = ingenic_mpll_cfg,
+ .cur_ctr = ingenic_cur_ctr,
+ .phy_config = ingenic_phy_config,
+ .mode_valid = ingenic_dw_hdmi_mode_valid,
+ .output_port = 1,
+};
+
+static const struct of_device_id ingenic_dw_hdmi_dt_ids[] = {
+ { .compatible = "ingenic,jz4780-dw-hdmi" },
+ { /* Sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, ingenic_dw_hdmi_dt_ids);
+
+static void ingenic_dw_hdmi_cleanup(void *data)
+{
+ struct dw_hdmi *hdmi = (struct dw_hdmi *)data;
+
+ dw_hdmi_remove(hdmi);
+}
+
+static int ingenic_dw_hdmi_probe(struct platform_device *pdev)
+{
+ struct dw_hdmi *hdmi;
+
+ hdmi = dw_hdmi_probe(pdev, &ingenic_dw_hdmi_plat_data);
+ if (IS_ERR(hdmi))
+ return PTR_ERR(hdmi);
+
+ return devm_add_action_or_reset(&pdev->dev, ingenic_dw_hdmi_cleanup, hdmi);
+}
+
+static struct platform_driver ingenic_dw_hdmi_driver = {
+ .probe = ingenic_dw_hdmi_probe,
+ .driver = {
+ .name = "dw-hdmi-ingenic",
+ .of_match_table = ingenic_dw_hdmi_dt_ids,
+ },
+};
+module_platform_driver(ingenic_dw_hdmi_driver);
+
+MODULE_DESCRIPTION("JZ4780 Specific DW-HDMI Driver Extension");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:dwhdmi-ingenic");
--
2.33.0
^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH v15 2/7] drm/ingenic: Add dw-hdmi driver specialization for jz4780
2022-02-12 15:50 ` [PATCH v15 2/7] drm/ingenic: Add dw-hdmi driver specialization for jz4780 H. Nikolaus Schaller
@ 2022-02-14 10:24 ` Paul Cercueil
2022-02-14 11:02 ` H. Nikolaus Schaller
0 siblings, 1 reply; 20+ messages in thread
From: Paul Cercueil @ 2022-02-14 10:24 UTC (permalink / raw)
To: H. Nikolaus Schaller
Cc: Andrzej Hajda, Neil Armstrong, Robert Foss, Paul Boddie,
Laurent Pinchart, Jernej Skrabec, David Airlie, Daniel Vetter,
Maxime Ripard, Harry Wentland, Kieran Bingham, Jonas Karlman,
linux-kernel, dri-devel, linux-mips, letux-kernel,
Ezequiel Garcia
Hi,
Le sam., févr. 12 2022 at 16:50:50 +0100, H. Nikolaus Schaller
<hns@goldelico.com> a écrit :
> From: Paul Boddie <paul@boddie.org.uk>
>
> A specialisation of the generic Synopsys HDMI driver is employed for
> JZ4780 HDMI support. This requires a new driver, plus device tree and
> configuration modifications.
>
> Here we add Kconfig DRM_INGENIC_DW_HDMI, Makefile and driver code.
>
> Signed-off-by: Paul Boddie <paul@boddie.org.uk>
> Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
> Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
> ---
> drivers/gpu/drm/ingenic/Kconfig | 9 ++
> drivers/gpu/drm/ingenic/Makefile | 1 +
> drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c | 104
> ++++++++++++++++++++++
> 3 files changed, 114 insertions(+)
> create mode 100644 drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
>
> diff --git a/drivers/gpu/drm/ingenic/Kconfig
> b/drivers/gpu/drm/ingenic/Kconfig
> index 001f59fb06d56..090830bcbde7f 100644
> --- a/drivers/gpu/drm/ingenic/Kconfig
> +++ b/drivers/gpu/drm/ingenic/Kconfig
> @@ -24,4 +24,13 @@ config DRM_INGENIC_IPU
>
> The Image Processing Unit (IPU) will appear as a second primary
> plane.
>
> +config DRM_INGENIC_DW_HDMI
> + tristate "Ingenic specific support for Synopsys DW HDMI"
> + depends on MACH_JZ4780
> + select DRM_DW_HDMI
> + help
> + Choose this option to enable Synopsys DesignWare HDMI based
> driver.
> + If you want to enable HDMI on Ingenic JZ4780 based SoC, you should
> + select this option.
> +
> endif
> diff --git a/drivers/gpu/drm/ingenic/Makefile
> b/drivers/gpu/drm/ingenic/Makefile
> index d313326bdddbb..f10cc1c5a5f22 100644
> --- a/drivers/gpu/drm/ingenic/Makefile
> +++ b/drivers/gpu/drm/ingenic/Makefile
> @@ -1,3 +1,4 @@
> obj-$(CONFIG_DRM_INGENIC) += ingenic-drm.o
> ingenic-drm-y = ingenic-drm-drv.o
> ingenic-drm-$(CONFIG_DRM_INGENIC_IPU) += ingenic-ipu.o
> +obj-$(CONFIG_DRM_INGENIC_DW_HDMI) += ingenic-dw-hdmi.o
> diff --git a/drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
> b/drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
> new file mode 100644
> index 0000000000000..34e986dd606cf
> --- /dev/null
> +++ b/drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
> @@ -0,0 +1,104 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/* Copyright (C) 2011-2013 Freescale Semiconductor, Inc.
> + * Copyright (C) 2019, 2020 Paul Boddie <paul@boddie.org.uk>
> + *
> + * Derived from dw_hdmi-imx.c with i.MX portions removed.
> + * Probe and remove operations derived from rcar_dw_hdmi.c.
> + */
> +
> +#include <linux/module.h>
> +#include <linux/of_platform.h>
> +#include <linux/platform_device.h>
> +
> +#include <drm/bridge/dw_hdmi.h>
> +#include <drm/drm_of.h>
> +#include <drm/drm_print.h>
> +
> +static const struct dw_hdmi_mpll_config ingenic_mpll_cfg[] = {
> + { 45250000, { { 0x01e0, 0x0000 }, { 0x21e1, 0x0000 }, { 0x41e2,
> 0x0000 } } },
> + { 92500000, { { 0x0140, 0x0005 }, { 0x2141, 0x0005 }, { 0x4142,
> 0x0005 } } },
> + { 148500000, { { 0x00a0, 0x000a }, { 0x20a1, 0x000a }, { 0x40a2,
> 0x000a } } },
> + { 216000000, { { 0x00a0, 0x000a }, { 0x2001, 0x000f }, { 0x4002,
> 0x000f } } },
> + { ~0UL, { { 0x0000, 0x0000 }, { 0x0000, 0x0000 }, { 0x0000,
> 0x0000 } } }
> +};
> +
> +static const struct dw_hdmi_curr_ctrl ingenic_cur_ctr[] = {
> + /*pixelclk bpp8 bpp10 bpp12 */
> + { 54000000, { 0x091c, 0x091c, 0x06dc } },
> + { 58400000, { 0x091c, 0x06dc, 0x06dc } },
> + { 72000000, { 0x06dc, 0x06dc, 0x091c } },
> + { 74250000, { 0x06dc, 0x0b5c, 0x091c } },
> + { 118800000, { 0x091c, 0x091c, 0x06dc } },
> + { 216000000, { 0x06dc, 0x0b5c, 0x091c } },
> + { ~0UL, { 0x0000, 0x0000, 0x0000 } },
> +};
> +
> +/*
> + * Resistance term 133Ohm Cfg
> + * PREEMP config 0.00
> + * TX/CK level 10
> + */
> +static const struct dw_hdmi_phy_config ingenic_phy_config[] = {
> + /*pixelclk symbol term vlev */
> + { 216000000, 0x800d, 0x0005, 0x01ad},
> + { ~0UL, 0x0000, 0x0000, 0x0000}
> +};
> +
> +static enum drm_mode_status
> +ingenic_dw_hdmi_mode_valid(struct dw_hdmi *hdmi, void *data,
> + const struct drm_display_info *info,
> + const struct drm_display_mode *mode)
> +{
> + if (mode->clock < 13500)
> + return MODE_CLOCK_LOW;
> + /* FIXME: Hardware is capable of 270MHz, but setup data is missing.
> */
> + if (mode->clock > 216000)
> + return MODE_CLOCK_HIGH;
> +
> + return MODE_OK;
> +}
> +
> +static struct dw_hdmi_plat_data ingenic_dw_hdmi_plat_data = {
> + .mpll_cfg = ingenic_mpll_cfg,
> + .cur_ctr = ingenic_cur_ctr,
> + .phy_config = ingenic_phy_config,
> + .mode_valid = ingenic_dw_hdmi_mode_valid,
> + .output_port = 1,
> +};
> +
> +static const struct of_device_id ingenic_dw_hdmi_dt_ids[] = {
> + { .compatible = "ingenic,jz4780-dw-hdmi" },
> + { /* Sentinel */ },
> +};
> +MODULE_DEVICE_TABLE(of, ingenic_dw_hdmi_dt_ids);
> +
> +static void ingenic_dw_hdmi_cleanup(void *data)
> +{
> + struct dw_hdmi *hdmi = (struct dw_hdmi *)data;
> +
> + dw_hdmi_remove(hdmi);
> +}
> +
> +static int ingenic_dw_hdmi_probe(struct platform_device *pdev)
> +{
> + struct dw_hdmi *hdmi;
> +
> + hdmi = dw_hdmi_probe(pdev, &ingenic_dw_hdmi_plat_data);
> + if (IS_ERR(hdmi))
> + return PTR_ERR(hdmi);
> +
> + return devm_add_action_or_reset(&pdev->dev,
> ingenic_dw_hdmi_cleanup, hdmi);
I think I said it already, but in this driver you could use a .remove
callback, there's not much point in using devm cleanups in such a
simple setup.
In your probe you could just:
return PTR_ERR_OR_ZERO(hdmi);
> +}
> +
> +static struct platform_driver ingenic_dw_hdmi_driver = {
> + .probe = ingenic_dw_hdmi_probe,
> + .driver = {
> + .name = "dw-hdmi-ingenic",
> + .of_match_table = ingenic_dw_hdmi_dt_ids,
> + },
> +};
> +module_platform_driver(ingenic_dw_hdmi_driver);
> +
> +MODULE_DESCRIPTION("JZ4780 Specific DW-HDMI Driver Extension");
> +MODULE_LICENSE("GPL v2");
> +MODULE_ALIAS("platform:dwhdmi-ingenic");
Should probably be "platform:dw-hdmi-ingenic"?
Cheers,
-Paul
>
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v15 2/7] drm/ingenic: Add dw-hdmi driver specialization for jz4780
2022-02-14 10:24 ` Paul Cercueil
@ 2022-02-14 11:02 ` H. Nikolaus Schaller
2022-02-14 11:30 ` Paul Cercueil
0 siblings, 1 reply; 20+ messages in thread
From: H. Nikolaus Schaller @ 2022-02-14 11:02 UTC (permalink / raw)
To: Paul Cercueil
Cc: Andrzej Hajda, Neil Armstrong, Robert Foss, Paul Boddie,
Laurent Pinchart, Jernej Skrabec, David Airlie, Daniel Vetter,
Maxime Ripard, Harry Wentland, Kieran Bingham, Jonas Karlman,
linux-kernel, dri-devel, linux-mips,
Discussions about the Letux Kernel, Ezequiel Garcia
Hi Paul,
> Am 14.02.2022 um 11:24 schrieb Paul Cercueil <paul@crapouillou.net>:
>
> Hi,
>
> Le sam., févr. 12 2022 at 16:50:50 +0100, H. Nikolaus Schaller <hns@goldelico.com> a écrit :
>> +static void ingenic_dw_hdmi_cleanup(void *data)
>> +{
>> + struct dw_hdmi *hdmi = (struct dw_hdmi *)data;
>> +
>> + dw_hdmi_remove(hdmi);
>> +}
>> +
>> +static int ingenic_dw_hdmi_probe(struct platform_device *pdev)
>> +{
>> + struct dw_hdmi *hdmi;
>> +
>> + hdmi = dw_hdmi_probe(pdev, &ingenic_dw_hdmi_plat_data);
>> + if (IS_ERR(hdmi))
>> + return PTR_ERR(hdmi);
>> +
>> + return devm_add_action_or_reset(&pdev->dev, ingenic_dw_hdmi_cleanup, hdmi);
>
> I think I said it already, but in this driver you could use a .remove callback, there's not much point in using devm cleanups in such a simple setup.
Well it was your suggestion after v8:
https://lore.kernel.org/all/DIA33R.QE29K7RKLI2C1@crapouillou.net/
So we now almost go back to RFC v1 almost 2 years ago:
https://patchwork.kernel.org/project/linux-mips/patch/2c131e1fb19e19f958a612f7186bc83f4afb0b0a.1582744379.git.hns@goldelico.com/
Of course there was a good reason to better handle the regulator
AND the dw_hdmi_remove() by a single mechanism.
Now the regulator has gone and been replaced by the hdmi connector
and we can go back.
>
> In your probe you could just:
> return PTR_ERR_OR_ZERO(hdmi);
No, this does not work since we need to platform_set_drvdata().
to be able to access the private struct in the remove callback.
And checking errors after platform_set_drvdata() can be done but
looks strange to me.
It is up to you what you prefer.
>
>> +}
>> +
>> +static struct platform_driver ingenic_dw_hdmi_driver = {
>> + .probe = ingenic_dw_hdmi_probe,
>> + .driver = {
>> + .name = "dw-hdmi-ingenic",
>> + .of_match_table = ingenic_dw_hdmi_dt_ids,
>> + },
>> +};
>> +module_platform_driver(ingenic_dw_hdmi_driver);
>> +
>> +MODULE_DESCRIPTION("JZ4780 Specific DW-HDMI Driver Extension");
>> +MODULE_LICENSE("GPL v2");
>> +MODULE_ALIAS("platform:dwhdmi-ingenic");
>
> Should probably be "platform:dw-hdmi-ingenic"?
Yes, indeed. Thanks for spotting!
Was also good in v1. Probably someone deleted the hyphen unnoticed during editing of "jz4780" to "ingenic"...
BR and thanks,
Nikolaus
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v15 2/7] drm/ingenic: Add dw-hdmi driver specialization for jz4780
2022-02-14 11:02 ` H. Nikolaus Schaller
@ 2022-02-14 11:30 ` Paul Cercueil
0 siblings, 0 replies; 20+ messages in thread
From: Paul Cercueil @ 2022-02-14 11:30 UTC (permalink / raw)
To: H. Nikolaus Schaller
Cc: Andrzej Hajda, Neil Armstrong, Robert Foss, Paul Boddie,
Laurent Pinchart, Jernej Skrabec, David Airlie, Daniel Vetter,
Maxime Ripard, Harry Wentland, Kieran Bingham, Jonas Karlman,
linux-kernel, dri-devel, linux-mips,
Discussions about the Letux Kernel, Ezequiel Garcia
Le lun., févr. 14 2022 at 12:02:53 +0100, H. Nikolaus Schaller
<hns@goldelico.com> a écrit :
> Hi Paul,
>
>> Am 14.02.2022 um 11:24 schrieb Paul Cercueil <paul@crapouillou.net>:
>>
>> Hi,
>>
>> Le sam., févr. 12 2022 at 16:50:50 +0100, H. Nikolaus Schaller
>> <hns@goldelico.com> a écrit :
>
>>> +static void ingenic_dw_hdmi_cleanup(void *data)
>>> +{
>>> + struct dw_hdmi *hdmi = (struct dw_hdmi *)data;
>>> +
>>> + dw_hdmi_remove(hdmi);
>>> +}
>>> +
>>> +static int ingenic_dw_hdmi_probe(struct platform_device *pdev)
>>> +{
>>> + struct dw_hdmi *hdmi;
>>> +
>>> + hdmi = dw_hdmi_probe(pdev, &ingenic_dw_hdmi_plat_data);
>>> + if (IS_ERR(hdmi))
>>> + return PTR_ERR(hdmi);
>>> +
>>> + return devm_add_action_or_reset(&pdev->dev,
>>> ingenic_dw_hdmi_cleanup, hdmi);
>>
>> I think I said it already, but in this driver you could use a
>> .remove callback, there's not much point in using devm cleanups in
>> such a simple setup.
>
> Well it was your suggestion after v8:
>
> https://lore.kernel.org/all/DIA33R.QE29K7RKLI2C1@crapouillou.net/
It made sense for your v8, not so much for your v15...
> So we now almost go back to RFC v1 almost 2 years ago:
>
> https://patchwork.kernel.org/project/linux-mips/patch/2c131e1fb19e19f958a612f7186bc83f4afb0b0a.1582744379.git.hns@goldelico.com/
>
> Of course there was a good reason to better handle the regulator
> AND the dw_hdmi_remove() by a single mechanism.
>
> Now the regulator has gone and been replaced by the hdmi connector
> and we can go back.
>
>>
>> In your probe you could just:
>> return PTR_ERR_OR_ZERO(hdmi);
>
> No, this does not work since we need to platform_set_drvdata().
> to be able to access the private struct in the remove callback.
> And checking errors after platform_set_drvdata() can be done but
> looks strange to me.
Yeah, I guess it would look strange. Fine then.
Then I guess just merge your current [6/7] with this one (and make sure
it comes after your current [5/7]) and it looks mergeable to me.
Cheers,
-Paul
> It is up to you what you prefer.
>
>>
>>> +}
>>> +
>>> +static struct platform_driver ingenic_dw_hdmi_driver = {
>>> + .probe = ingenic_dw_hdmi_probe,
>>> + .driver = {
>>> + .name = "dw-hdmi-ingenic",
>>> + .of_match_table = ingenic_dw_hdmi_dt_ids,
>>> + },
>>> +};
>>> +module_platform_driver(ingenic_dw_hdmi_driver);
>>> +
>>> +MODULE_DESCRIPTION("JZ4780 Specific DW-HDMI Driver Extension");
>>> +MODULE_LICENSE("GPL v2");
>>> +MODULE_ALIAS("platform:dwhdmi-ingenic");
>>
>> Should probably be "platform:dw-hdmi-ingenic"?
>
> Yes, indeed. Thanks for spotting!
>
> Was also good in v1. Probably someone deleted the hyphen unnoticed
> during editing of "jz4780" to "ingenic"...
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v15 3/7] drm/bridge: display-connector: add ddc-en gpio support
2022-02-12 15:50 [PATCH v15 0/7] MIPS: JZ4780 and CI20 HDMI H. Nikolaus Schaller
2022-02-12 15:50 ` [PATCH v15 1/7] drm/ingenic: Fix support for JZ4780 HDMI output H. Nikolaus Schaller
2022-02-12 15:50 ` [PATCH v15 2/7] drm/ingenic: Add dw-hdmi driver specialization for jz4780 H. Nikolaus Schaller
@ 2022-02-12 15:50 ` H. Nikolaus Schaller
2022-02-12 15:50 ` [PATCH v15 4/7] drm/bridge: dw-hdmi: repair interworking with hdmi-connector for jz4780 H. Nikolaus Schaller
` (3 subsequent siblings)
6 siblings, 0 replies; 20+ messages in thread
From: H. Nikolaus Schaller @ 2022-02-12 15:50 UTC (permalink / raw)
To: Andrzej Hajda, Neil Armstrong, Robert Foss, Paul Boddie,
Laurent Pinchart, Jernej Skrabec, David Airlie, Daniel Vetter,
Paul Cercueil, Maxime Ripard, Harry Wentland,
H. Nikolaus Schaller, Kieran Bingham
Cc: Jonas Karlman, linux-kernel, dri-devel, linux-mips, letux-kernel
"hdmi-connector.yaml" bindings defines an optional property
"ddc-en-gpios" for a single gpio to enable DDC operation.
Usually this controls +5V power on the HDMI connector.
This +5V may also be needed for HPD.
This was not reflected in code.
Now, the driver activates the ddc gpio after probe and
deactivates after remove so it is "almost on".
But only if this driver is loaded (and not e.g. blacklisted
as module).
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
drivers/gpu/drm/bridge/display-connector.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/drivers/gpu/drm/bridge/display-connector.c b/drivers/gpu/drm/bridge/display-connector.c
index d24f5b90feabf..e4d52a7e31b71 100644
--- a/drivers/gpu/drm/bridge/display-connector.c
+++ b/drivers/gpu/drm/bridge/display-connector.c
@@ -24,6 +24,7 @@ struct display_connector {
int hpd_irq;
struct regulator *dp_pwr;
+ struct gpio_desc *ddc_en;
};
static inline struct display_connector *
@@ -345,6 +346,17 @@ static int display_connector_probe(struct platform_device *pdev)
}
}
+ /* enable DDC */
+ if (type == DRM_MODE_CONNECTOR_HDMIA) {
+ conn->ddc_en = devm_gpiod_get_optional(&pdev->dev, "ddc-en",
+ GPIOD_OUT_HIGH);
+
+ if (IS_ERR(conn->ddc_en)) {
+ dev_err(&pdev->dev, "Couldn't get ddc-en gpio\n");
+ return PTR_ERR(conn->ddc_en);
+ }
+ }
+
conn->bridge.funcs = &display_connector_bridge_funcs;
conn->bridge.of_node = pdev->dev.of_node;
@@ -373,6 +385,9 @@ static int display_connector_remove(struct platform_device *pdev)
{
struct display_connector *conn = platform_get_drvdata(pdev);
+ if (conn->ddc_en)
+ gpiod_set_value(conn->ddc_en, 0);
+
if (conn->dp_pwr)
regulator_disable(conn->dp_pwr);
--
2.33.0
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v15 4/7] drm/bridge: dw-hdmi: repair interworking with hdmi-connector for jz4780
2022-02-12 15:50 [PATCH v15 0/7] MIPS: JZ4780 and CI20 HDMI H. Nikolaus Schaller
` (2 preceding siblings ...)
2022-02-12 15:50 ` [PATCH v15 3/7] drm/bridge: display-connector: add ddc-en gpio support H. Nikolaus Schaller
@ 2022-02-12 15:50 ` H. Nikolaus Schaller
2022-02-21 8:11 ` Neil Armstrong
2022-02-12 15:50 ` [PATCH v15 5/7] drm/bridge: dw-hdmi: introduce dw_hdmi_enable_poll() H. Nikolaus Schaller
` (2 subsequent siblings)
6 siblings, 1 reply; 20+ messages in thread
From: H. Nikolaus Schaller @ 2022-02-12 15:50 UTC (permalink / raw)
To: Andrzej Hajda, Neil Armstrong, Robert Foss, Paul Boddie,
Laurent Pinchart, Jernej Skrabec, David Airlie, Daniel Vetter,
Paul Cercueil, Maxime Ripard, Harry Wentland,
H. Nikolaus Schaller, Kieran Bingham
Cc: Jonas Karlman, linux-kernel, dri-devel, linux-mips, letux-kernel
Commit 7cd70656d1285b ("drm/bridge: display-connector: implement bus fmts callbacks")
introduced a new mechanism to negotiate bus formats between hdmi connector
and the synopsys hdmi driver inside the jz4780.
By this, the dw-hdmi is no longer the only bridge and sets up a list
of formats in dw_hdmi_bridge_atomic_get_output_bus_fmts().
This includes MEDIA_BUS_FMT_UYVY8_1X16 which is chosen for the jz4780 but only
produces a black screen.
This fix is based on the observation that max_bpc = 0 when running this
function while info->bpc = 8. Since the formats checks before this always test
for max_bpc >= info->pbc indirectly my assumption is that we must check it
here as well.
Adding the proposed patch makes the CI20/jz4780 panel work again in
MEDIA_BUS_FMT_RGB888_1X24 mode.
Fixes: 7cd70656d1285b ("drm/bridge: display-connector: implement bus fmts callbacks")
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index b0d8110dd412c..826a055a7a273 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -2620,10 +2620,10 @@ static u32 *dw_hdmi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge,
output_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30;
}
- if (info->color_formats & DRM_COLOR_FORMAT_YCBCR422)
+ if (max_bpc >= info->bpc && info->color_formats & DRM_COLOR_FORMAT_YCBCR422)
output_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16;
- if (info->color_formats & DRM_COLOR_FORMAT_YCBCR444)
+ if (max_bpc >= info->bpc && info->color_formats & DRM_COLOR_FORMAT_YCBCR444)
output_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24;
/* Default 8bit RGB fallback */
--
2.33.0
^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH v15 4/7] drm/bridge: dw-hdmi: repair interworking with hdmi-connector for jz4780
2022-02-12 15:50 ` [PATCH v15 4/7] drm/bridge: dw-hdmi: repair interworking with hdmi-connector for jz4780 H. Nikolaus Schaller
@ 2022-02-21 8:11 ` Neil Armstrong
2022-02-26 17:12 ` H. Nikolaus Schaller
0 siblings, 1 reply; 20+ messages in thread
From: Neil Armstrong @ 2022-02-21 8:11 UTC (permalink / raw)
To: H. Nikolaus Schaller, Andrzej Hajda, Robert Foss, Paul Boddie,
Laurent Pinchart, Jernej Skrabec, David Airlie, Daniel Vetter,
Paul Cercueil, Maxime Ripard, Harry Wentland, Kieran Bingham
Cc: letux-kernel, linux-mips, linux-kernel, dri-devel, Jonas Karlman
Hi,
On 12/02/2022 16:50, H. Nikolaus Schaller wrote:
> Commit 7cd70656d1285b ("drm/bridge: display-connector: implement bus fmts callbacks")
>
> introduced a new mechanism to negotiate bus formats between hdmi connector
> and the synopsys hdmi driver inside the jz4780.
>
> By this, the dw-hdmi is no longer the only bridge and sets up a list
> of formats in dw_hdmi_bridge_atomic_get_output_bus_fmts().
>
> This includes MEDIA_BUS_FMT_UYVY8_1X16 which is chosen for the jz4780 but only
> produces a black screen.
>
> This fix is based on the observation that max_bpc = 0 when running this
> function while info->bpc = 8. Since the formats checks before this always test
> for max_bpc >= info->pbc indirectly my assumption is that we must check it
> here as well.
>
> Adding the proposed patch makes the CI20/jz4780 panel work again in
> MEDIA_BUS_FMT_RGB888_1X24 mode.
>
> Fixes: 7cd70656d1285b ("drm/bridge: display-connector: implement bus fmts callbacks")
> Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
> ---
> drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> index b0d8110dd412c..826a055a7a273 100644
> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> @@ -2620,10 +2620,10 @@ static u32 *dw_hdmi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge,
> output_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30;
> }
>
> - if (info->color_formats & DRM_COLOR_FORMAT_YCBCR422)
> + if (max_bpc >= info->bpc && info->color_formats & DRM_COLOR_FORMAT_YCBCR422)
> output_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16;
>
> - if (info->color_formats & DRM_COLOR_FORMAT_YCBCR444)
> + if (max_bpc >= info->bpc && info->color_formats & DRM_COLOR_FORMAT_YCBCR444)
> output_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24;
>
> /* Default 8bit RGB fallback */
Please do the same for all other cases and change the patch subject to something more accurate like:
"drm/bridge: dw-hdmi: take display info bpc in account for bus formats negociation"
Neil
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v15 4/7] drm/bridge: dw-hdmi: repair interworking with hdmi-connector for jz4780
2022-02-21 8:11 ` Neil Armstrong
@ 2022-02-26 17:12 ` H. Nikolaus Schaller
0 siblings, 0 replies; 20+ messages in thread
From: H. Nikolaus Schaller @ 2022-02-26 17:12 UTC (permalink / raw)
To: Neil Armstrong
Cc: Andrzej Hajda, Robert Foss, Paul Boddie, Laurent Pinchart,
Jernej Skrabec, David Airlie, Daniel Vetter, Paul Cercueil,
Maxime Ripard, Harry Wentland, Kieran Bingham, letux-kernel,
linux-mips, linux-kernel, dri-devel, Jonas Karlman
Hi Neil,
> Am 21.02.2022 um 09:11 schrieb Neil Armstrong <narmstrong@baylibre.com>:
>
> Hi,
>
> On 12/02/2022 16:50, H. Nikolaus Schaller wrote:
>> Commit 7cd70656d1285b ("drm/bridge: display-connector: implement bus fmts callbacks")
>> introduced a new mechanism to negotiate bus formats between hdmi connector
>> and the synopsys hdmi driver inside the jz4780.
>> By this, the dw-hdmi is no longer the only bridge and sets up a list
>> of formats in dw_hdmi_bridge_atomic_get_output_bus_fmts().
>> This includes MEDIA_BUS_FMT_UYVY8_1X16 which is chosen for the jz4780 but only
>> produces a black screen.
>> This fix is based on the observation that max_bpc = 0 when running this
>> function while info->bpc = 8. Since the formats checks before this always test
>> for max_bpc >= info->pbc indirectly my assumption is that we must check it
>> here as well.
>> Adding the proposed patch makes the CI20/jz4780 panel work again in
>> MEDIA_BUS_FMT_RGB888_1X24 mode.
>> Fixes: 7cd70656d1285b ("drm/bridge: display-connector: implement bus fmts callbacks")
>> Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
>> ---
>> drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
>> index b0d8110dd412c..826a055a7a273 100644
>> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
>> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
>> @@ -2620,10 +2620,10 @@ static u32 *dw_hdmi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge,
>> output_fmts[i++] = MEDIA_BUS_FMT_RGB101010_1X30;
>> }
>> - if (info->color_formats & DRM_COLOR_FORMAT_YCBCR422)
>> + if (max_bpc >= info->bpc && info->color_formats & DRM_COLOR_FORMAT_YCBCR422)
>> output_fmts[i++] = MEDIA_BUS_FMT_UYVY8_1X16;
>> - if (info->color_formats & DRM_COLOR_FORMAT_YCBCR444)
>> + if (max_bpc >= info->bpc && info->color_formats & DRM_COLOR_FORMAT_YCBCR444)
>> output_fmts[i++] = MEDIA_BUS_FMT_YUV8_1X24;
>> /* Default 8bit RGB fallback */
>
> Please do the same for all other cases and change the patch subject to something more accurate like:
> "drm/bridge: dw-hdmi: take display info bpc in account for bus formats negociation"
thank you very much for this analysis.
In fact my fix was also not correctly doing the right comparisons. The rules should have the
same structure as for all cases before, i.e. check for >= 8 and then handle both color formats.
I have fixed and tested on my CI20 board and updated the description and Fixes: tags.
v16 will come now (as part of the jz4780 hdmi series).
BR and thanks,
Nikolaus
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v15 5/7] drm/bridge: dw-hdmi: introduce dw_hdmi_enable_poll()
2022-02-12 15:50 [PATCH v15 0/7] MIPS: JZ4780 and CI20 HDMI H. Nikolaus Schaller
` (3 preceding siblings ...)
2022-02-12 15:50 ` [PATCH v15 4/7] drm/bridge: dw-hdmi: repair interworking with hdmi-connector for jz4780 H. Nikolaus Schaller
@ 2022-02-12 15:50 ` H. Nikolaus Schaller
2022-02-12 15:50 ` [PATCH v15 6/7] drm/ingenic: dw-hdmi: make hot plug detection work for CI20 H. Nikolaus Schaller
2022-02-12 15:50 ` [PATCH v15 7/7] [RFC] drm/ingenic: add some more features specific to jz4780 H. Nikolaus Schaller
6 siblings, 0 replies; 20+ messages in thread
From: H. Nikolaus Schaller @ 2022-02-12 15:50 UTC (permalink / raw)
To: Andrzej Hajda, Neil Armstrong, Robert Foss, Paul Boddie,
Laurent Pinchart, Jernej Skrabec, David Airlie, Daniel Vetter,
Paul Cercueil, Maxime Ripard, Harry Wentland,
H. Nikolaus Schaller, Kieran Bingham
Cc: Jonas Karlman, linux-kernel, dri-devel, linux-mips, letux-kernel
so that specialization drivers like ingenic-dw-hdmi can enable polling.
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 9 +++++++++
include/drm/bridge/dw_hdmi.h | 1 +
2 files changed, 10 insertions(+)
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index 826a055a7a273..fc2d5422c8a19 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -3216,6 +3216,15 @@ static int dw_hdmi_parse_dt(struct dw_hdmi *hdmi)
return 0;
}
+void dw_hdmi_enable_poll(struct dw_hdmi *hdmi, bool enable)
+{
+ if (hdmi->bridge.dev)
+ hdmi->bridge.dev->mode_config.poll_enabled = enable;
+ else
+ dev_warn(hdmi->dev, "no hdmi->bridge.dev");
+}
+EXPORT_SYMBOL_GPL(dw_hdmi_enable_poll);
+
struct dw_hdmi *dw_hdmi_probe(struct platform_device *pdev,
const struct dw_hdmi_plat_data *plat_data)
{
diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h
index 2a1f85f9a8a3f..963960794b40e 100644
--- a/include/drm/bridge/dw_hdmi.h
+++ b/include/drm/bridge/dw_hdmi.h
@@ -196,5 +196,6 @@ enum drm_connector_status dw_hdmi_phy_read_hpd(struct dw_hdmi *hdmi,
void dw_hdmi_phy_update_hpd(struct dw_hdmi *hdmi, void *data,
bool force, bool disabled, bool rxsense);
void dw_hdmi_phy_setup_hpd(struct dw_hdmi *hdmi, void *data);
+void dw_hdmi_enable_poll(struct dw_hdmi *hdmi, bool enable);
#endif /* __IMX_HDMI_H__ */
--
2.33.0
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v15 6/7] drm/ingenic: dw-hdmi: make hot plug detection work for CI20
2022-02-12 15:50 [PATCH v15 0/7] MIPS: JZ4780 and CI20 HDMI H. Nikolaus Schaller
` (4 preceding siblings ...)
2022-02-12 15:50 ` [PATCH v15 5/7] drm/bridge: dw-hdmi: introduce dw_hdmi_enable_poll() H. Nikolaus Schaller
@ 2022-02-12 15:50 ` H. Nikolaus Schaller
2022-02-14 10:18 ` Paul Cercueil
2022-02-12 15:50 ` [PATCH v15 7/7] [RFC] drm/ingenic: add some more features specific to jz4780 H. Nikolaus Schaller
6 siblings, 1 reply; 20+ messages in thread
From: H. Nikolaus Schaller @ 2022-02-12 15:50 UTC (permalink / raw)
To: Andrzej Hajda, Neil Armstrong, Robert Foss, Paul Boddie,
Laurent Pinchart, Jernej Skrabec, David Airlie, Daniel Vetter,
Paul Cercueil, Maxime Ripard, Harry Wentland,
H. Nikolaus Schaller, Kieran Bingham
Cc: Jonas Karlman, linux-kernel, dri-devel, linux-mips, letux-kernel
There is no hpd-gpio installed on the CI20 board HDMI connector.
Hence there is no hpd detection by the connector driver and we
have to enable polling by the dw-hdmi driver.
We need to set .poll_enabled but that struct component
can only be accessed in the core code. Hence we use the public
setter function drm_kms_helper_hotplug_event().
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c b/drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
index 34e986dd606cf..90547a28dc5c7 100644
--- a/drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
+++ b/drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
@@ -55,6 +55,8 @@ ingenic_dw_hdmi_mode_valid(struct dw_hdmi *hdmi, void *data,
if (mode->clock > 216000)
return MODE_CLOCK_HIGH;
+ dw_hdmi_enable_poll(hdmi, true);
+
return MODE_OK;
}
--
2.33.0
^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH v15 6/7] drm/ingenic: dw-hdmi: make hot plug detection work for CI20
2022-02-12 15:50 ` [PATCH v15 6/7] drm/ingenic: dw-hdmi: make hot plug detection work for CI20 H. Nikolaus Schaller
@ 2022-02-14 10:18 ` Paul Cercueil
0 siblings, 0 replies; 20+ messages in thread
From: Paul Cercueil @ 2022-02-14 10:18 UTC (permalink / raw)
To: H. Nikolaus Schaller
Cc: Andrzej Hajda, Neil Armstrong, Robert Foss, Paul Boddie,
Laurent Pinchart, Jernej Skrabec, David Airlie, Daniel Vetter,
Maxime Ripard, Harry Wentland, Kieran Bingham, Jonas Karlman,
linux-kernel, dri-devel, linux-mips, letux-kernel
Hi Nikolaus,
Le sam., févr. 12 2022 at 16:50:54 +0100, H. Nikolaus Schaller
<hns@goldelico.com> a écrit :
> There is no hpd-gpio installed on the CI20 board HDMI connector.
> Hence there is no hpd detection by the connector driver and we
> have to enable polling by the dw-hdmi driver.
>
> We need to set .poll_enabled but that struct component
> can only be accessed in the core code. Hence we use the public
> setter function drm_kms_helper_hotplug_event().
As I said in your v13 - if you move your patch [2/7] after the patch
[5/7] then you can drop this patch (merge it with the patch that
introduces ingenic-dw-hdmi.c).
Otherwise between the introduction of the driver and the hotplug
detection fix, the driver is not usable.
Cheers,
-Paul
>
> Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
> ---
> drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
> b/drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
> index 34e986dd606cf..90547a28dc5c7 100644
> --- a/drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
> +++ b/drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
> @@ -55,6 +55,8 @@ ingenic_dw_hdmi_mode_valid(struct dw_hdmi *hdmi,
> void *data,
> if (mode->clock > 216000)
> return MODE_CLOCK_HIGH;
>
> + dw_hdmi_enable_poll(hdmi, true);
> +
> return MODE_OK;
> }
>
> --
> 2.33.0
>
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v15 7/7] [RFC] drm/ingenic: add some more features specific to jz4780
2022-02-12 15:50 [PATCH v15 0/7] MIPS: JZ4780 and CI20 HDMI H. Nikolaus Schaller
` (5 preceding siblings ...)
2022-02-12 15:50 ` [PATCH v15 6/7] drm/ingenic: dw-hdmi: make hot plug detection work for CI20 H. Nikolaus Schaller
@ 2022-02-12 15:50 ` H. Nikolaus Schaller
6 siblings, 0 replies; 20+ messages in thread
From: H. Nikolaus Schaller @ 2022-02-12 15:50 UTC (permalink / raw)
To: Andrzej Hajda, Neil Armstrong, Robert Foss, Paul Boddie,
Laurent Pinchart, Jernej Skrabec, David Airlie, Daniel Vetter,
Paul Cercueil, Maxime Ripard, Harry Wentland,
H. Nikolaus Schaller, Kieran Bingham
Cc: Jonas Karlman, linux-kernel, dri-devel, linux-mips, letux-kernel
From: Paul Boddie <paul@boddie.org.uk>
The jz4780 has some more features which should be initialized
according to the vendor kernel.
Signed-off-by: Paul Boddie <paul@boddie.org.uk>
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 34 +++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
index dcf44cb00821f..fb2cdb188b993 100644
--- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
+++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
@@ -66,6 +66,9 @@ struct jz_soc_info {
bool needs_dev_clk;
bool has_osd;
bool has_alpha;
+ bool has_pcfg;
+ bool has_recover;
+ bool has_rgbc;
bool map_noncoherent;
bool use_extended_hwdesc;
bool plane_f0_not_working;
@@ -732,6 +735,9 @@ static void ingenic_drm_encoder_atomic_mode_set(struct drm_encoder *encoder,
| JZ_LCD_CFG_SPL_DISABLE | JZ_LCD_CFG_REV_DISABLE;
}
+ if (priv->soc_info->has_recover)
+ cfg |= JZ_LCD_CFG_RECOVER_FIFO_UNDERRUN;
+
if (priv->soc_info->use_extended_hwdesc)
cfg |= JZ_LCD_CFG_DESCRIPTOR_8;
@@ -1320,6 +1326,22 @@ static int ingenic_drm_bind(struct device *dev, bool has_components)
osdc |= JZ_LCD_OSDC_ALPHAEN;
regmap_write(priv->map, JZ_REG_LCD_OSDC, osdc);
+ /* Magic values from the vendor kernel for the priority thresholds. */
+ if (soc_info->has_pcfg)
+ regmap_write(priv->map, JZ_REG_LCD_PCFG,
+ JZ_LCD_PCFG_PRI_MODE |
+ JZ_LCD_PCFG_HP_BST_16 |
+ (511 << JZ_LCD_PCFG_THRESHOLD2_OFFSET) |
+ (400 << JZ_LCD_PCFG_THRESHOLD1_OFFSET) |
+ (256 << JZ_LCD_PCFG_THRESHOLD0_OFFSET));
+
+ /* RGB output control may be superfluous. */
+ if (soc_info->has_rgbc)
+ regmap_write(priv->map, JZ_REG_LCD_RGBC,
+ JZ_LCD_RGBC_RGB_FORMAT_ENABLE |
+ JZ_LCD_RGBC_ODD_RGB |
+ JZ_LCD_RGBC_EVEN_RGB);
+
mutex_init(&priv->clk_mutex);
priv->clock_nb.notifier_call = ingenic_drm_update_pixclk;
@@ -1483,6 +1505,9 @@ static const struct jz_soc_info jz4740_soc_info = {
.needs_dev_clk = true,
.has_osd = false,
.map_noncoherent = false,
+ .has_pcfg = false,
+ .has_recover = false,
+ .has_rgbc = false,
.max_width = 800,
.max_height = 600,
.formats_f1 = jz4740_formats,
@@ -1494,6 +1519,9 @@ static const struct jz_soc_info jz4725b_soc_info = {
.needs_dev_clk = false,
.has_osd = true,
.map_noncoherent = false,
+ .has_pcfg = false,
+ .has_recover = true,
+ .has_rgbc = true,
.max_width = 800,
.max_height = 600,
.formats_f1 = jz4725b_formats_f1,
@@ -1506,6 +1534,9 @@ static const struct jz_soc_info jz4770_soc_info = {
.needs_dev_clk = false,
.has_osd = true,
.map_noncoherent = true,
+ .has_pcfg = false,
+ .has_recover = true,
+ .has_rgbc = true,
.max_width = 1280,
.max_height = 720,
.formats_f1 = jz4770_formats_f1,
@@ -1518,6 +1549,9 @@ static const struct jz_soc_info jz4780_soc_info = {
.needs_dev_clk = true,
.has_osd = true,
.has_alpha = true,
+ .has_pcfg = true,
+ .has_recover = true,
+ .has_rgbc = true,
.use_extended_hwdesc = true,
.plane_f0_not_working = true, /* REVISIT */
.max_width = 4096,
--
2.33.0
^ permalink raw reply related [flat|nested] 20+ messages in thread