diff mbox series

[v2,2/4] drm/bridge: imx: add bridge wrapper driver for i.MX8MP DWC HDMI

Message ID 20221216210742.3233382-2-l.stach@pengutronix.de (mailing list archive)
State New, archived
Headers show
Series [v2,1/4] dt-bindings: display: imx: add binding for i.MX8MP HDMI TX | expand

Commit Message

Lucas Stach Dec. 16, 2022, 9:07 p.m. UTC
Add a simple wrapper driver for the DWC HDMI bridge driver that
implements the few bits that are necessary to abstract the i.MX8MP
SoC integration.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: Marek Vasut <marex@denx.de>
---
 drivers/gpu/drm/bridge/imx/Kconfig       |   9 ++
 drivers/gpu/drm/bridge/imx/Makefile      |   2 +
 drivers/gpu/drm/bridge/imx/imx8mp-hdmi.c | 140 +++++++++++++++++++++++
 3 files changed, 151 insertions(+)
 create mode 100644 drivers/gpu/drm/bridge/imx/imx8mp-hdmi.c

Comments

Liu Ying Dec. 17, 2022, 8:29 a.m. UTC | #1
On Fri, 2022-12-16 at 22:07 +0100, Lucas Stach wrote:
> Add a simple wrapper driver for the DWC HDMI bridge driver that
> implements the few bits that are necessary to abstract the i.MX8MP
> SoC integration.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Tested-by: Marek Vasut <marex@denx.de>
> ---
>  drivers/gpu/drm/bridge/imx/Kconfig       |   9 ++
>  drivers/gpu/drm/bridge/imx/Makefile      |   2 +
>  drivers/gpu/drm/bridge/imx/imx8mp-hdmi.c | 140
> +++++++++++++++++++++++
>  3 files changed, 151 insertions(+)
>  create mode 100644 drivers/gpu/drm/bridge/imx/imx8mp-hdmi.c
> 

Can you please provide a changelog since this is v2?

> diff --git a/drivers/gpu/drm/bridge/imx/Kconfig
> b/drivers/gpu/drm/bridge/imx/Kconfig
> index 608f47f41bcd..d828d8bfd893 100644
> --- a/drivers/gpu/drm/bridge/imx/Kconfig
> +++ b/drivers/gpu/drm/bridge/imx/Kconfig
> @@ -44,4 +44,13 @@ config DRM_IMX8QXP_PIXEL_LINK_TO_DPI
>  	  Choose this to enable pixel link to display pixel
> interface(PXL2DPI)
>  	  found in Freescale i.MX8qxp processor.
>  
> +config DRM_IMX8MP_DW_HDMI_BRIDGE

Sort the config names alphabetically please.

> +	tristate "i.MX8MP HDMI bridge support"

To show the prompts in this Kconfig file in a consistent fashion,
please add 'Freescale' before 'i.MX8MP'.

> +	depends on OF
> +	depends on COMMON_CLK
> +	select DRM_DW_HDMI
> +	help
> +	  Choose this to enable support for the internal HDMI encoder
> found
> +	  on the i.MX8MP SoC.
> +
>  endif # ARCH_MXC || COMPILE_TEST
> diff --git a/drivers/gpu/drm/bridge/imx/Makefile
> b/drivers/gpu/drm/bridge/imx/Makefile
> index aa90ec8d5433..03b0074ae538 100644
> --- a/drivers/gpu/drm/bridge/imx/Makefile
> +++ b/drivers/gpu/drm/bridge/imx/Makefile
> @@ -7,3 +7,5 @@ obj-$(CONFIG_DRM_IMX8QXP_LDB) += imx8qxp-ldb.o
>  obj-$(CONFIG_DRM_IMX8QXP_PIXEL_COMBINER) += imx8qxp-pixel-combiner.o
>  obj-$(CONFIG_DRM_IMX8QXP_PIXEL_LINK) += imx8qxp-pixel-link.o
>  obj-$(CONFIG_DRM_IMX8QXP_PIXEL_LINK_TO_DPI) += imx8qxp-pxl2dpi.o
> +
> +obj-$(CONFIG_DRM_IMX8MP_DW_HDMI_BRIDGE) += imx8mp-hdmi.o

Sort the config names alphabetically.

> diff --git a/drivers/gpu/drm/bridge/imx/imx8mp-hdmi.c
> b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi.c
> new file mode 100644
> index 000000000000..06849b817aed
> --- /dev/null
> +++ b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi.c
> @@ -0,0 +1,140 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +
> +/*
> + * Copyright (C) 2022 Pengutronix, Lucas Stach <
> kernel@pengutronix.de>
> + */
> +
> +#include <drm/bridge/dw_hdmi.h>
> +#include <drm/drm_modes.h>
> +#include <linux/clk.h>
> +#include <linux/mod_devicetable.h>
> +#include <linux/module.h>
> +#include <linux/platform_device.h>

Header files in linux/ come before those in drm/.

> +
> +struct imx8mp_hdmi {
> +	struct dw_hdmi_plat_data plat_data;
> +	struct dw_hdmi *dw_hdmi;
> +	struct clk *pixclk;
> +	struct clk *fdcc;
> +};
> +
> +static enum drm_mode_status
> +imx8mp_hdmi_mode_valid(struct dw_hdmi *dw_hdmi, void *data,
> +		       const struct drm_display_info *info,
> +		       const struct drm_display_mode *mode)
> +{
> +	struct imx8mp_hdmi *hdmi = (struct imx8mp_hdmi *)data;
> +
> +	if (mode->clock < 13500)
> +		return MODE_CLOCK_LOW;
> +
> +	if (mode->clock > 297000)
> +		return MODE_CLOCK_HIGH;
> +
> +	if (clk_round_rate(hdmi->pixclk, mode->clock * 1000) !=
> +	    mode->clock * 1000)
> +		return MODE_CLOCK_RANGE;
> +
> +	/* We don't support double-clocked and Interlaced modes */
> +	if ((mode->flags & DRM_MODE_FLAG_DBLCLK) ||
> +	    (mode->flags & DRM_MODE_FLAG_INTERLACE))
> +		return MODE_BAD;
> +
> +	return MODE_OK;
> +}
> +
> +static int imx8mp_hdmi_phy_init(struct dw_hdmi *dw_hdmi, void *data,
> +				const struct drm_display_info *display,
> +				const struct drm_display_mode *mode)
> +{
> +	return 0;
> +}
> +
> +static void imx8mp_hdmi_phy_disable(struct dw_hdmi *dw_hdmi, void
> *data)
> +{
> +}
> +
> +static void im8mp_hdmi_phy_setup_hpd(struct dw_hdmi *hdmi, void
> *data)
> +{
> +	/*
> +	 * Just release PHY core from reset, all other power management
> is done
> +	 * by the PHY driver.
> +	 */
> +	dw_hdmi_phy_gen1_reset(hdmi);
> +
> +	dw_hdmi_phy_setup_hpd(hdmi, data);
> +}
> +
> +static const struct dw_hdmi_phy_ops imx8mp_hdmi_phy_ops = {
> +	.init		= imx8mp_hdmi_phy_init,
> +	.disable	= imx8mp_hdmi_phy_disable,
> +	.setup_hpd	= im8mp_hdmi_phy_setup_hpd,
> +	.read_hpd	= dw_hdmi_phy_read_hpd,
> +	.update_hpd	= dw_hdmi_phy_update_hpd,
> +};
> +
> +static int imx8mp_dw_hdmi_probe(struct platform_device *pdev)
> +{
> +	struct device *dev = &pdev->dev;
> +	struct dw_hdmi_plat_data *plat_data;
> +	struct imx8mp_hdmi *hdmi;
> +	int ret;

Please fix this build warning:

drivers/gpu/drm/bridge/imx/imx8mp-hdmi.c: In function
‘imx8mp_dw_hdmi_probe’:
drivers/gpu/drm/bridge/imx/imx8mp-hdmi.c:80:13: warning: unused
variable ‘ret’ [-Wunused-variable]
   80 |         int ret;
      |             ^~~

> +
> +	hdmi = devm_kzalloc(dev, sizeof(*hdmi), GFP_KERNEL);
> +	if (!hdmi)
> +		return -ENOMEM;
> +
> +	plat_data = &hdmi->plat_data;
> +
> +	hdmi->pixclk = devm_clk_get(dev, "pix");
> +	if (IS_ERR(hdmi->pixclk))
> +		return dev_err_probe(dev, PTR_ERR(hdmi->pixclk),
> +				     "Unable to get pixel clock\n");
> +
> +	hdmi->fdcc = devm_clk_get_enabled(dev, "fdcc");
> +	if (IS_ERR(hdmi->fdcc))
> +		return dev_err_probe(dev, PTR_ERR(hdmi->fdcc),
> +				     "Unable to get FDCC clock\n");

Similar to Laurent's comment on v1 here, why does fdcc clock need to be
always enabled? 

> +
> +	plat_data->mode_valid = imx8mp_hdmi_mode_valid;
> +	plat_data->phy_ops = &imx8mp_hdmi_phy_ops;
> +	plat_data->phy_name = "SAMSUNG HDMI TX PHY";
> +	plat_data->priv_data = hdmi;

Need to set plat_data->phy_force_vendor to be true? Or, you rely on
reading the HDMI_CONFIG2_ID register to determine the phy type?

> +
> +	hdmi->dw_hdmi = dw_hdmi_probe(pdev, plat_data);
> +	if (IS_ERR(hdmi->dw_hdmi))
> +		return PTR_ERR(hdmi->dw_hdmi);
> +
> +	platform_set_drvdata(pdev, hdmi);
> +
> +	return 0;
> +}
> +
> +static int imx8mp_dw_hdmi_remove(struct platform_device *pdev)
> +{
> +	struct imx8mp_hdmi *hdmi = platform_get_drvdata(pdev);
> +
> +	dw_hdmi_remove(hdmi->dw_hdmi);
> +
> +	return 0;
> +}
> +
> +static const struct of_device_id imx8mp_dw_hdmi_of_table[] = {
> +	{ .compatible = "fsl,imx8mp-hdmi" },
> +	{ /* Sentinel */ },

Nitpick: ',' after the sentinel is not needed since it's the last one.

Regards,
Liu Ying

> +};
> +MODULE_DEVICE_TABLE(of, imx8mp_dw_hdmi_of_table);
> +
> +static struct platform_driver imx8mp_dw_hdmi_platform_driver = {
> +	.probe		= imx8mp_dw_hdmi_probe,
> +	.remove		= imx8mp_dw_hdmi_remove,
> +	.driver		= {
> +		.name	= "imx8mp-dw-hdmi",
> +		.of_match_table = imx8mp_dw_hdmi_of_table,
> +	},
> +};
> +
> +module_platform_driver(imx8mp_dw_hdmi_platform_driver);
> +
> +MODULE_DESCRIPTION("i.MX8MP HDMI encoder driver");
> +MODULE_LICENSE("GPL");
Adam Ford Feb. 15, 2023, 1:24 p.m. UTC | #2
On Sat, Dec 17, 2022 at 2:30 AM Liu Ying <victor.liu@nxp.com> wrote:

> On Fri, 2022-12-16 at 22:07 +0100, Lucas Stach wrote:
> > Add a simple wrapper driver for the DWC HDMI bridge driver that
> > implements the few bits that are necessary to abstract the i.MX8MP
> > SoC integration.
> >
> > Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > Tested-by: Marek Vasut <marex@denx.de>
>

Tested-by: Adam Ford <aford173@gmail.com> #imx8mp-beacon


> > ---
> >  drivers/gpu/drm/bridge/imx/Kconfig       |   9 ++
> >  drivers/gpu/drm/bridge/imx/Makefile      |   2 +
> >  drivers/gpu/drm/bridge/imx/imx8mp-hdmi.c | 140
> > +++++++++++++++++++++++
> >  3 files changed, 151 insertions(+)
> >  create mode 100644 drivers/gpu/drm/bridge/imx/imx8mp-hdmi.c
> >
>
> Can you please provide a changelog since this is v2?
>
> > diff --git a/drivers/gpu/drm/bridge/imx/Kconfig
> > b/drivers/gpu/drm/bridge/imx/Kconfig
> > index 608f47f41bcd..d828d8bfd893 100644
> > --- a/drivers/gpu/drm/bridge/imx/Kconfig
> > +++ b/drivers/gpu/drm/bridge/imx/Kconfig
> > @@ -44,4 +44,13 @@ config DRM_IMX8QXP_PIXEL_LINK_TO_DPI
> >         Choose this to enable pixel link to display pixel
> > interface(PXL2DPI)
> >         found in Freescale i.MX8qxp processor.
> >
> > +config DRM_IMX8MP_DW_HDMI_BRIDGE
>
> Sort the config names alphabetically please.
>
> > +     tristate "i.MX8MP HDMI bridge support"
>
> To show the prompts in this Kconfig file in a consistent fashion,
> please add 'Freescale' before 'i.MX8MP'.
>
> > +     depends on OF
> > +     depends on COMMON_CLK
> > +     select DRM_DW_HDMI
> > +     help
> > +       Choose this to enable support for the internal HDMI encoder
> > found
> > +       on the i.MX8MP SoC.
> > +
> >  endif # ARCH_MXC || COMPILE_TEST
> > diff --git a/drivers/gpu/drm/bridge/imx/Makefile
> > b/drivers/gpu/drm/bridge/imx/Makefile
> > index aa90ec8d5433..03b0074ae538 100644
> > --- a/drivers/gpu/drm/bridge/imx/Makefile
> > +++ b/drivers/gpu/drm/bridge/imx/Makefile
> > @@ -7,3 +7,5 @@ obj-$(CONFIG_DRM_IMX8QXP_LDB) += imx8qxp-ldb.o
> >  obj-$(CONFIG_DRM_IMX8QXP_PIXEL_COMBINER) += imx8qxp-pixel-combiner.o
> >  obj-$(CONFIG_DRM_IMX8QXP_PIXEL_LINK) += imx8qxp-pixel-link.o
> >  obj-$(CONFIG_DRM_IMX8QXP_PIXEL_LINK_TO_DPI) += imx8qxp-pxl2dpi.o
> > +
> > +obj-$(CONFIG_DRM_IMX8MP_DW_HDMI_BRIDGE) += imx8mp-hdmi.o
>
> Sort the config names alphabetically.
>
> > diff --git a/drivers/gpu/drm/bridge/imx/imx8mp-hdmi.c
> > b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi.c
> > new file mode 100644
> > index 000000000000..06849b817aed
> > --- /dev/null
> > +++ b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi.c
> > @@ -0,0 +1,140 @@
> > +// SPDX-License-Identifier: GPL-2.0+
> > +
> > +/*
> > + * Copyright (C) 2022 Pengutronix, Lucas Stach <
> > kernel@pengutronix.de>
> > + */
> > +
> > +#include <drm/bridge/dw_hdmi.h>
> > +#include <drm/drm_modes.h>
> > +#include <linux/clk.h>
> > +#include <linux/mod_devicetable.h>
> > +#include <linux/module.h>
> > +#include <linux/platform_device.h>
>
> Header files in linux/ come before those in drm/.
>
> > +
> > +struct imx8mp_hdmi {
> > +     struct dw_hdmi_plat_data plat_data;
> > +     struct dw_hdmi *dw_hdmi;
> > +     struct clk *pixclk;
> > +     struct clk *fdcc;
> > +};
> > +
> > +static enum drm_mode_status
> > +imx8mp_hdmi_mode_valid(struct dw_hdmi *dw_hdmi, void *data,
> > +                    const struct drm_display_info *info,
> > +                    const struct drm_display_mode *mode)
> > +{
> > +     struct imx8mp_hdmi *hdmi = (struct imx8mp_hdmi *)data;
> > +
> > +     if (mode->clock < 13500)
> > +             return MODE_CLOCK_LOW;
> > +
> > +     if (mode->clock > 297000)
> > +             return MODE_CLOCK_HIGH;
> > +
> > +     if (clk_round_rate(hdmi->pixclk, mode->clock * 1000) !=
> > +         mode->clock * 1000)
> > +             return MODE_CLOCK_RANGE;
> > +
> > +     /* We don't support double-clocked and Interlaced modes */
> > +     if ((mode->flags & DRM_MODE_FLAG_DBLCLK) ||
> > +         (mode->flags & DRM_MODE_FLAG_INTERLACE))
> > +             return MODE_BAD;
> > +
> > +     return MODE_OK;
> > +}
> > +
> > +static int imx8mp_hdmi_phy_init(struct dw_hdmi *dw_hdmi, void *data,
> > +                             const struct drm_display_info *display,
> > +                             const struct drm_display_mode *mode)
> > +{
> > +     return 0;
> > +}
> > +
> > +static void imx8mp_hdmi_phy_disable(struct dw_hdmi *dw_hdmi, void
> > *data)
> > +{
> > +}
> > +
> > +static void im8mp_hdmi_phy_setup_hpd(struct dw_hdmi *hdmi, void
> > *data)
> > +{
> > +     /*
> > +      * Just release PHY core from reset, all other power management
> > is done
> > +      * by the PHY driver.
> > +      */
> > +     dw_hdmi_phy_gen1_reset(hdmi);
> > +
> > +     dw_hdmi_phy_setup_hpd(hdmi, data);
> > +}
> > +
> > +static const struct dw_hdmi_phy_ops imx8mp_hdmi_phy_ops = {
> > +     .init           = imx8mp_hdmi_phy_init,
> > +     .disable        = imx8mp_hdmi_phy_disable,
> > +     .setup_hpd      = im8mp_hdmi_phy_setup_hpd,
> > +     .read_hpd       = dw_hdmi_phy_read_hpd,
> > +     .update_hpd     = dw_hdmi_phy_update_hpd,
> > +};
> > +
> > +static int imx8mp_dw_hdmi_probe(struct platform_device *pdev)
> > +{
> > +     struct device *dev = &pdev->dev;
> > +     struct dw_hdmi_plat_data *plat_data;
> > +     struct imx8mp_hdmi *hdmi;
> > +     int ret;
>
> Please fix this build warning:
>
> drivers/gpu/drm/bridge/imx/imx8mp-hdmi.c: In function
> ‘imx8mp_dw_hdmi_probe’:
> drivers/gpu/drm/bridge/imx/imx8mp-hdmi.c:80:13: warning: unused
> variable ‘ret’ [-Wunused-variable]
>    80 |         int ret;
>       |             ^~~
>
> > +
> > +     hdmi = devm_kzalloc(dev, sizeof(*hdmi), GFP_KERNEL);
> > +     if (!hdmi)
> > +             return -ENOMEM;
> > +
> > +     plat_data = &hdmi->plat_data;
> > +
> > +     hdmi->pixclk = devm_clk_get(dev, "pix");
> > +     if (IS_ERR(hdmi->pixclk))
> > +             return dev_err_probe(dev, PTR_ERR(hdmi->pixclk),
> > +                                  "Unable to get pixel clock\n");
> > +
> > +     hdmi->fdcc = devm_clk_get_enabled(dev, "fdcc");
> > +     if (IS_ERR(hdmi->fdcc))
> > +             return dev_err_probe(dev, PTR_ERR(hdmi->fdcc),
> > +                                  "Unable to get FDCC clock\n");
>
> Similar to Laurent's comment on v1 here, why does fdcc clock need to be
> always enabled?
>
> > +
> > +     plat_data->mode_valid = imx8mp_hdmi_mode_valid;
> > +     plat_data->phy_ops = &imx8mp_hdmi_phy_ops;
> > +     plat_data->phy_name = "SAMSUNG HDMI TX PHY";
> > +     plat_data->priv_data = hdmi;
>
> Need to set plat_data->phy_force_vendor to be true? Or, you rely on
> reading the HDMI_CONFIG2_ID register to determine the phy type?
>
> > +
> > +     hdmi->dw_hdmi = dw_hdmi_probe(pdev, plat_data);
> > +     if (IS_ERR(hdmi->dw_hdmi))
> > +             return PTR_ERR(hdmi->dw_hdmi);
> > +
> > +     platform_set_drvdata(pdev, hdmi);
> > +
> > +     return 0;
> > +}
> > +
> > +static int imx8mp_dw_hdmi_remove(struct platform_device *pdev)
> > +{
> > +     struct imx8mp_hdmi *hdmi = platform_get_drvdata(pdev);
> > +
> > +     dw_hdmi_remove(hdmi->dw_hdmi);
> > +
> > +     return 0;
> > +}
> > +
> > +static const struct of_device_id imx8mp_dw_hdmi_of_table[] = {
> > +     { .compatible = "fsl,imx8mp-hdmi" },
> > +     { /* Sentinel */ },
>
> Nitpick: ',' after the sentinel is not needed since it's the last one.
>
> Regards,
> Liu Ying
>
> > +};
> > +MODULE_DEVICE_TABLE(of, imx8mp_dw_hdmi_of_table);
> > +
> > +static struct platform_driver imx8mp_dw_hdmi_platform_driver = {
> > +     .probe          = imx8mp_dw_hdmi_probe,
> > +     .remove         = imx8mp_dw_hdmi_remove,
> > +     .driver         = {
> > +             .name   = "imx8mp-dw-hdmi",
> > +             .of_match_table = imx8mp_dw_hdmi_of_table,
> > +     },
> > +};
> > +
> > +module_platform_driver(imx8mp_dw_hdmi_platform_driver);
> > +
> > +MODULE_DESCRIPTION("i.MX8MP HDMI encoder driver");
> > +MODULE_LICENSE("GPL");
>
>
Richard Leitner March 7, 2023, 12:59 p.m. UTC | #3
Hi Lucas,

On Fri, Dec 16, 2022 at 10:07:40PM +0100, Lucas Stach wrote:
> Add a simple wrapper driver for the DWC HDMI bridge driver that
> implements the few bits that are necessary to abstract the i.MX8MP
> SoC integration.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Tested-by: Marek Vasut <marex@denx.de>

I've successfully tested this patch on our custom i.MX8MP board. The
test case was basically "cat /dev/urandom > /dev/fb1" with a 800x480
HDMI display.

Therefore please feel free to add:

Tested-by: Richard Leitner <richard.leitner@skidata.com>

> ---
>  drivers/gpu/drm/bridge/imx/Kconfig       |   9 ++
>  drivers/gpu/drm/bridge/imx/Makefile      |   2 +
>  drivers/gpu/drm/bridge/imx/imx8mp-hdmi.c | 140 +++++++++++++++++++++++
>  3 files changed, 151 insertions(+)
>  create mode 100644 drivers/gpu/drm/bridge/imx/imx8mp-hdmi.c
Frieder Schrempf July 25, 2023, 7:23 a.m. UTC | #4
On 16.12.22 22:07, Lucas Stach wrote:
> Add a simple wrapper driver for the DWC HDMI bridge driver that
> implements the few bits that are necessary to abstract the i.MX8MP
> SoC integration.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Tested-by: Marek Vasut <marex@denx.de>

I tested this on our Kontron BL i.MX8MP board. Feel free to add:

Tested-by: Frieder Schrempf <frieder.schrempf@kontron.de>
Luca Ceresoli Aug. 18, 2023, 1:07 p.m. UTC | #5
Hi Lucas,

On Fri, 16 Dec 2022 22:07:40 +0100
Lucas Stach <l.stach@pengutronix.de> wrote:

> Add a simple wrapper driver for the DWC HDMI bridge driver that
> implements the few bits that are necessary to abstract the i.MX8MP
> SoC integration.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Tested-by: Marek Vasut <marex@denx.de>

I realized I had sent my Tested-by to v1 when v2 was already out. So,
in case you still need some encouragement for keeping on with this
series:

[Tested on a custom board using modetest on v6.5-rc6]
Tested-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
diff mbox series

Patch

diff --git a/drivers/gpu/drm/bridge/imx/Kconfig b/drivers/gpu/drm/bridge/imx/Kconfig
index 608f47f41bcd..d828d8bfd893 100644
--- a/drivers/gpu/drm/bridge/imx/Kconfig
+++ b/drivers/gpu/drm/bridge/imx/Kconfig
@@ -44,4 +44,13 @@  config DRM_IMX8QXP_PIXEL_LINK_TO_DPI
 	  Choose this to enable pixel link to display pixel interface(PXL2DPI)
 	  found in Freescale i.MX8qxp processor.
 
+config DRM_IMX8MP_DW_HDMI_BRIDGE
+	tristate "i.MX8MP HDMI bridge support"
+	depends on OF
+	depends on COMMON_CLK
+	select DRM_DW_HDMI
+	help
+	  Choose this to enable support for the internal HDMI encoder found
+	  on the i.MX8MP SoC.
+
 endif # ARCH_MXC || COMPILE_TEST
diff --git a/drivers/gpu/drm/bridge/imx/Makefile b/drivers/gpu/drm/bridge/imx/Makefile
index aa90ec8d5433..03b0074ae538 100644
--- a/drivers/gpu/drm/bridge/imx/Makefile
+++ b/drivers/gpu/drm/bridge/imx/Makefile
@@ -7,3 +7,5 @@  obj-$(CONFIG_DRM_IMX8QXP_LDB) += imx8qxp-ldb.o
 obj-$(CONFIG_DRM_IMX8QXP_PIXEL_COMBINER) += imx8qxp-pixel-combiner.o
 obj-$(CONFIG_DRM_IMX8QXP_PIXEL_LINK) += imx8qxp-pixel-link.o
 obj-$(CONFIG_DRM_IMX8QXP_PIXEL_LINK_TO_DPI) += imx8qxp-pxl2dpi.o
+
+obj-$(CONFIG_DRM_IMX8MP_DW_HDMI_BRIDGE) += imx8mp-hdmi.o
diff --git a/drivers/gpu/drm/bridge/imx/imx8mp-hdmi.c b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi.c
new file mode 100644
index 000000000000..06849b817aed
--- /dev/null
+++ b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi.c
@@ -0,0 +1,140 @@ 
+// SPDX-License-Identifier: GPL-2.0+
+
+/*
+ * Copyright (C) 2022 Pengutronix, Lucas Stach <kernel@pengutronix.de>
+ */
+
+#include <drm/bridge/dw_hdmi.h>
+#include <drm/drm_modes.h>
+#include <linux/clk.h>
+#include <linux/mod_devicetable.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+
+struct imx8mp_hdmi {
+	struct dw_hdmi_plat_data plat_data;
+	struct dw_hdmi *dw_hdmi;
+	struct clk *pixclk;
+	struct clk *fdcc;
+};
+
+static enum drm_mode_status
+imx8mp_hdmi_mode_valid(struct dw_hdmi *dw_hdmi, void *data,
+		       const struct drm_display_info *info,
+		       const struct drm_display_mode *mode)
+{
+	struct imx8mp_hdmi *hdmi = (struct imx8mp_hdmi *)data;
+
+	if (mode->clock < 13500)
+		return MODE_CLOCK_LOW;
+
+	if (mode->clock > 297000)
+		return MODE_CLOCK_HIGH;
+
+	if (clk_round_rate(hdmi->pixclk, mode->clock * 1000) !=
+	    mode->clock * 1000)
+		return MODE_CLOCK_RANGE;
+
+	/* We don't support double-clocked and Interlaced modes */
+	if ((mode->flags & DRM_MODE_FLAG_DBLCLK) ||
+	    (mode->flags & DRM_MODE_FLAG_INTERLACE))
+		return MODE_BAD;
+
+	return MODE_OK;
+}
+
+static int imx8mp_hdmi_phy_init(struct dw_hdmi *dw_hdmi, void *data,
+				const struct drm_display_info *display,
+				const struct drm_display_mode *mode)
+{
+	return 0;
+}
+
+static void imx8mp_hdmi_phy_disable(struct dw_hdmi *dw_hdmi, void *data)
+{
+}
+
+static void im8mp_hdmi_phy_setup_hpd(struct dw_hdmi *hdmi, void *data)
+{
+	/*
+	 * Just release PHY core from reset, all other power management is done
+	 * by the PHY driver.
+	 */
+	dw_hdmi_phy_gen1_reset(hdmi);
+
+	dw_hdmi_phy_setup_hpd(hdmi, data);
+}
+
+static const struct dw_hdmi_phy_ops imx8mp_hdmi_phy_ops = {
+	.init		= imx8mp_hdmi_phy_init,
+	.disable	= imx8mp_hdmi_phy_disable,
+	.setup_hpd	= im8mp_hdmi_phy_setup_hpd,
+	.read_hpd	= dw_hdmi_phy_read_hpd,
+	.update_hpd	= dw_hdmi_phy_update_hpd,
+};
+
+static int imx8mp_dw_hdmi_probe(struct platform_device *pdev)
+{
+	struct device *dev = &pdev->dev;
+	struct dw_hdmi_plat_data *plat_data;
+	struct imx8mp_hdmi *hdmi;
+	int ret;
+
+	hdmi = devm_kzalloc(dev, sizeof(*hdmi), GFP_KERNEL);
+	if (!hdmi)
+		return -ENOMEM;
+
+	plat_data = &hdmi->plat_data;
+
+	hdmi->pixclk = devm_clk_get(dev, "pix");
+	if (IS_ERR(hdmi->pixclk))
+		return dev_err_probe(dev, PTR_ERR(hdmi->pixclk),
+				     "Unable to get pixel clock\n");
+
+	hdmi->fdcc = devm_clk_get_enabled(dev, "fdcc");
+	if (IS_ERR(hdmi->fdcc))
+		return dev_err_probe(dev, PTR_ERR(hdmi->fdcc),
+				     "Unable to get FDCC clock\n");
+
+	plat_data->mode_valid = imx8mp_hdmi_mode_valid;
+	plat_data->phy_ops = &imx8mp_hdmi_phy_ops;
+	plat_data->phy_name = "SAMSUNG HDMI TX PHY";
+	plat_data->priv_data = hdmi;
+
+	hdmi->dw_hdmi = dw_hdmi_probe(pdev, plat_data);
+	if (IS_ERR(hdmi->dw_hdmi))
+		return PTR_ERR(hdmi->dw_hdmi);
+
+	platform_set_drvdata(pdev, hdmi);
+
+	return 0;
+}
+
+static int imx8mp_dw_hdmi_remove(struct platform_device *pdev)
+{
+	struct imx8mp_hdmi *hdmi = platform_get_drvdata(pdev);
+
+	dw_hdmi_remove(hdmi->dw_hdmi);
+
+	return 0;
+}
+
+static const struct of_device_id imx8mp_dw_hdmi_of_table[] = {
+	{ .compatible = "fsl,imx8mp-hdmi" },
+	{ /* Sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, imx8mp_dw_hdmi_of_table);
+
+static struct platform_driver imx8mp_dw_hdmi_platform_driver = {
+	.probe		= imx8mp_dw_hdmi_probe,
+	.remove		= imx8mp_dw_hdmi_remove,
+	.driver		= {
+		.name	= "imx8mp-dw-hdmi",
+		.of_match_table = imx8mp_dw_hdmi_of_table,
+	},
+};
+
+module_platform_driver(imx8mp_dw_hdmi_platform_driver);
+
+MODULE_DESCRIPTION("i.MX8MP HDMI encoder driver");
+MODULE_LICENSE("GPL");