From: "H. Nikolaus Schaller" <hns@goldelico.com>
To: Neil Armstrong <narmstrong@baylibre.com>
Cc: Paul Cercueil <paul@crapouillou.net>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Kees Cook <keescook@chromium.org>,
"Eric W. Biederman" <ebiederm@xmission.com>,
Miquel Raynal <miquel.raynal@bootlin.com>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
Andrzej Hajda <a.hajda@samsung.com>,
Robert Foss <robert.foss@linaro.org>,
Laurent Pinchart <Laurent.pinchart@ideasonboard.com>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Ezequiel Garcia <ezequiel@collabora.com>,
Harry Wentland <harry.wentland@amd.com>,
Sam Ravnborg <sam@ravnborg.org>,
Maxime Ripard <maxime@cerno.tech>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Paul Boddie <paul@boddie.org.uk>,
devicetree@vger.kernel.org, linux-mips@vger.kernel.org,
linux-kernel@vger.kernel.org, letux-kernel@openphoenux.org,
Jonas Karlman <jonas@kwiboo.se>,
dri-devel@lists.freedesktop.org
Subject: Re: [PATCH v4 06/10] drm/ingenic: Add dw-hdmi driver for jz4780
Date: Tue, 28 Sep 2021 15:35:43 +0200 [thread overview]
Message-ID: <1E12CA58-78A7-4E23-BC41-64F0963D4C3A@goldelico.com> (raw)
In-Reply-To: <86c61519-697f-9ca8-4257-074173656c38@baylibre.com>
Hi Neil,
> Am 28.09.2021 um 15:02 schrieb Neil Armstrong <narmstrong@baylibre.com>:
>
> On 27/09/2021 18:44, H. Nikolaus Schaller wrote:
>> 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.
>>
>> 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 | 142 ++++++++++++++++++++++
>> 3 files changed, 152 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 3b57f8be007c..4c7d311fbeff 100644
>> --- a/drivers/gpu/drm/ingenic/Kconfig
>> +++ b/drivers/gpu/drm/ingenic/Kconfig
>> @@ -25,4 +25,13 @@ config DRM_INGENIC_IPU
>>
>> The Image Processing Unit (IPU) will appear as a second primary plane.
>>
>> +config DRM_INGENIC_DW_HDMI
>> + bool "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 d313326bdddb..3db9888a6c04 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
>> +ingenic-drm-$(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 000000000000..dd9c94ae842e
>> --- /dev/null
>> +++ b/drivers/gpu/drm/ingenic/ingenic-dw-hdmi.c
>> @@ -0,0 +1,142 @@
>> +// 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/platform_device.h>
>> +#include <linux/regmap.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 bool
>> +ingenic_dw_hdmi_mode_fixup(struct drm_bridge *bridge,
>> + const struct drm_display_mode *mode,
>> + struct drm_display_mode *adjusted_mode)
>> +{
>> + adjusted_mode->flags |= (DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC);
>> + adjusted_mode->flags &= ~(DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC);
>> +
>> + return true;
>> +}
>> +
>> +static const struct drm_bridge_timings ingenic_dw_hdmi_timings = {
>> + .input_bus_flags = DRM_BUS_FLAG_PIXDATA_SAMPLE_NEGEDGE,
>> +};
>
> These should go in the intermediate encoder bridge callbacks Paul introduces in his patch at [1].
>
> With that patch 4 can be dropped.
>
> [1] https://lore.kernel.org/r/20210922205555.496871-7-paul@crapouillou.net
>
> Neil
Sorry, but I can't follow you here. Our patch set is on top of Paul's patch [1]
and requires Paul's work to be merged first.
And our 4/10 is needed to specialize dw-hdmi to the jz4780 like it is done for
other SoC integration. It addresses a different stage of the jz4780 HDMI chain
than [1].
BR,
Nikolaus
next prev parent reply other threads:[~2021-09-28 13:36 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-27 16:44 [PATCH v4 00/10] MIPS: JZ4780 and CI20 HDMI H. Nikolaus Schaller
2021-09-27 16:44 ` [PATCH v4 01/10] drm/ingenic: Fix drm_init error path if IPU was registered H. Nikolaus Schaller
2021-09-27 16:44 ` [PATCH v4 02/10] drm/ingenic: Add support for JZ4780 and HDMI output H. Nikolaus Schaller
2021-09-28 9:35 ` Paul Cercueil
2021-09-28 10:21 ` H. Nikolaus Schaller
2021-09-28 12:06 ` H. Nikolaus Schaller
2021-09-29 13:25 ` H. Nikolaus Schaller
2021-09-29 14:30 ` Paul Cercueil
2021-09-29 14:42 ` H. Nikolaus Schaller
2021-09-27 16:44 ` [PATCH v4 03/10] dt-bindings: display: Add ingenic,jz4780-dw-hdmi DT Schema H. Nikolaus Schaller
2021-09-27 17:07 ` maxime
2021-09-28 8:59 ` H. Nikolaus Schaller
2021-09-28 9:18 ` Maxime Ripard
2021-09-28 9:34 ` H. Nikolaus Schaller
2021-09-28 2:01 ` Rob Herring
2021-09-27 16:44 ` [PATCH v4 04/10] drm/bridge: synopsis: Add mode_fixup and bridge timings support H. Nikolaus Schaller
2021-09-27 16:44 ` [PATCH v4 05/10] drm/bridge: synopsis: Fix to properly handle HPD H. Nikolaus Schaller
2021-09-27 17:00 ` Maxime Ripard
2021-09-27 17:53 ` H. Nikolaus Schaller
2021-09-27 16:44 ` [PATCH v4 06/10] drm/ingenic: Add dw-hdmi driver for jz4780 H. Nikolaus Schaller
2021-09-27 17:08 ` Maxime Ripard
2021-09-28 13:02 ` Neil Armstrong
2021-09-28 13:35 ` H. Nikolaus Schaller [this message]
2021-09-28 14:10 ` Paul Cercueil
2021-09-27 16:44 ` [PATCH v4 07/10] MIPS: DTS: jz4780: Account for Synopsys HDMI driver and LCD controllers H. Nikolaus Schaller
2021-09-27 16:44 ` [PATCH v4 08/10] MIPS: DTS: CI20: Add DT nodes for HDMI setup H. Nikolaus Schaller
2021-09-27 16:44 ` [PATCH v4 09/10] MIPS: defconfig: CI20: configure for DRM_DW_HDMI_JZ4780 H. Nikolaus Schaller
2021-09-27 16:44 ` [PATCH v4 10/10] drm/ingenic: add some jz4780 specific features H. Nikolaus Schaller
2021-09-28 9:58 ` Paul Cercueil
2021-09-28 10:06 ` H. Nikolaus Schaller
2021-09-28 11:50 ` H. Nikolaus Schaller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1E12CA58-78A7-4E23-BC41-64F0963D4C3A@goldelico.com \
--to=hns@goldelico.com \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=a.hajda@samsung.com \
--cc=airlied@linux.ie \
--cc=broonie@kernel.org \
--cc=daniel@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=ebiederm@xmission.com \
--cc=ezequiel@collabora.com \
--cc=geert+renesas@glider.be \
--cc=harry.wentland@amd.com \
--cc=hverkuil-cisco@xs4all.nl \
--cc=jernej.skrabec@gmail.com \
--cc=jonas@kwiboo.se \
--cc=keescook@chromium.org \
--cc=letux-kernel@openphoenux.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=maxime@cerno.tech \
--cc=miquel.raynal@bootlin.com \
--cc=narmstrong@baylibre.com \
--cc=paul@boddie.org.uk \
--cc=paul@crapouillou.net \
--cc=robert.foss@linaro.org \
--cc=robh+dt@kernel.org \
--cc=sam@ravnborg.org \
--cc=tsbogend@alpha.franken.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).