The HDMI TX Parallel Audio Interface (HTX_PAI) is a digital module that
acts as the bridge between the Audio Subsystem to the HDMI TX Controller.
This IP block is found in the HDMI subsystem of the i.MX8MP SoC.
Data received from the audio subsystem can have an arbitrary component
ordering. The HTX_PAI block has integrated muxing options to select which
sections of the 32-bit input data word will be mapped to each IEC60958
field. The HTX_PAI_FIELD_CTRL register contains mux selects to
individually select P,C,U,V,Data, and Preamble.
Use component helper that imx8mp-hdmi-tx will be aggregate driver,
imx8mp-hdmi-pai will be component driver, then imx8mp-hdmi-pai can use
bind() ops to get the plat_data from imx8mp-hdmi-tx device.
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
---
drivers/gpu/drm/bridge/imx/Kconfig | 8 +
drivers/gpu/drm/bridge/imx/Makefile | 1 +
drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c | 205 +++++++++++++++++++
drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c | 55 +++++
include/drm/bridge/dw_hdmi.h | 6 +
5 files changed, 275 insertions(+)
create mode 100644 drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c
diff --git a/drivers/gpu/drm/bridge/imx/Kconfig b/drivers/gpu/drm/bridge/imx/Kconfig
index 9a480c6abb85..6c1a8bc5d4a0 100644
--- a/drivers/gpu/drm/bridge/imx/Kconfig
+++ b/drivers/gpu/drm/bridge/imx/Kconfig
@@ -18,12 +18,20 @@ config DRM_IMX8MP_DW_HDMI_BRIDGE
depends on OF
depends on COMMON_CLK
select DRM_DW_HDMI
+ imply DRM_IMX8MP_HDMI_PAI
imply DRM_IMX8MP_HDMI_PVI
imply PHY_FSL_SAMSUNG_HDMI_PHY
help
Choose this to enable support for the internal HDMI encoder found
on the i.MX8MP SoC.
+config DRM_IMX8MP_HDMI_PAI
+ tristate "Freescale i.MX8MP HDMI PAI bridge support"
+ depends on OF
+ help
+ Choose this to enable support for the internal HDMI TX Parallel
+ Audio Interface found on the Freescale i.MX8MP SoC.
+
config DRM_IMX8MP_HDMI_PVI
tristate "Freescale i.MX8MP HDMI PVI bridge support"
depends on OF
diff --git a/drivers/gpu/drm/bridge/imx/Makefile b/drivers/gpu/drm/bridge/imx/Makefile
index dd5d48584806..8d01fda25451 100644
--- a/drivers/gpu/drm/bridge/imx/Makefile
+++ b/drivers/gpu/drm/bridge/imx/Makefile
@@ -1,6 +1,7 @@
obj-$(CONFIG_DRM_IMX_LDB_HELPER) += imx-ldb-helper.o
obj-$(CONFIG_DRM_IMX_LEGACY_BRIDGE) += imx-legacy-bridge.o
obj-$(CONFIG_DRM_IMX8MP_DW_HDMI_BRIDGE) += imx8mp-hdmi-tx.o
+obj-$(CONFIG_DRM_IMX8MP_HDMI_PAI) += imx8mp-hdmi-pai.o
obj-$(CONFIG_DRM_IMX8MP_HDMI_PVI) += imx8mp-hdmi-pvi.o
obj-$(CONFIG_DRM_IMX8QM_LDB) += imx8qm-ldb.o
obj-$(CONFIG_DRM_IMX8QXP_LDB) += imx8qxp-ldb.o
diff --git a/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c
new file mode 100644
index 000000000000..9002974073ca
--- /dev/null
+++ b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c
@@ -0,0 +1,205 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2025 NXP
+ */
+
+#include <linux/bitfield.h>
+#include <linux/component.h>
+#include <linux/module.h>
+#include <linux/of_platform.h>
+#include <linux/platform_device.h>
+#include <drm/bridge/dw_hdmi.h>
+#include <sound/asoundef.h>
+
+#define HTX_PAI_CTRL 0x00
+#define ENABLE BIT(0)
+
+#define HTX_PAI_CTRL_EXT 0x04
+#define WTMK_HIGH_MASK GENMASK(31, 24)
+#define WTMK_LOW_MASK GENMASK(23, 16)
+#define NUM_CH_MASK GENMASK(10, 8)
+#define WTMK_HIGH(n) FIELD_PREP(WTMK_HIGH_MASK, (n))
+#define WTMK_LOW(n) FIELD_PREP(WTMK_LOW_MASK, (n))
+
+#define HTX_PAI_FIELD_CTRL 0x08
+#define B_FILT BIT(31)
+#define PARITY_EN BIT(30)
+#define END_SEL BIT(29)
+#define PRE_SEL GENMASK(28, 24)
+#define D_SEL GENMASK(23, 20)
+#define V_SEL GENMASK(19, 15)
+#define U_SEL GENMASK(14, 10)
+#define C_SEL GENMASK(9, 5)
+#define P_SEL GENMASK(4, 0)
+
+#define HTX_PAI_STAT 0x0c
+#define HTX_PAI_IRQ_NOMASK 0x10
+#define HTX_PAI_IRQ_MASKED 0x14
+#define HTX_PAI_IRQ_MASK 0x18
+
+struct imx8mp_hdmi_pai {
+ struct device *dev;
+ struct regmap *regmap;
+};
+
+static void imx8mp_hdmi_pai_enable(struct dw_hdmi *dw_hdmi, int channel,
+ int width, int rate, int non_pcm,
+ int iec958)
+{
+ const struct dw_hdmi_plat_data *pdata = dw_hdmi_to_plat_data(dw_hdmi);
+ struct imx8mp_hdmi_pai *hdmi_pai = (struct imx8mp_hdmi_pai *)pdata->priv_audio;
+ int val;
+
+ /* PAI set control extended */
+ val = WTMK_HIGH(3) | WTMK_LOW(3);
+ val |= FIELD_PREP(NUM_CH_MASK, channel - 1);
+ regmap_write(hdmi_pai->regmap, HTX_PAI_CTRL_EXT, val);
+
+ /* IEC60958 format */
+ if (iec958) {
+ val = FIELD_PREP_CONST(P_SEL,
+ __bf_shf(IEC958_SUBFRAME_PARITY));
+ val |= FIELD_PREP_CONST(C_SEL,
+ __bf_shf(IEC958_SUBFRAME_CHANNEL_STATUS));
+ val |= FIELD_PREP_CONST(U_SEL,
+ __bf_shf(IEC958_SUBFRAME_USER_DATA));
+ val |= FIELD_PREP_CONST(V_SEL,
+ __bf_shf(IEC958_SUBFRAME_VALIDITY));
+ val |= FIELD_PREP_CONST(D_SEL,
+ __bf_shf(IEC958_SUBFRAME_SAMPLE_24_MASK));
+ val |= FIELD_PREP_CONST(PRE_SEL,
+ __bf_shf(IEC958_SUBFRAME_PREAMBLE_MASK));
+ } else {
+ /* PCM choose 24bit*/
+ val = FIELD_PREP(D_SEL, width - 24);
+ }
+
+ regmap_write(hdmi_pai->regmap, HTX_PAI_FIELD_CTRL, val);
+
+ /* PAI start running */
+ regmap_write(hdmi_pai->regmap, HTX_PAI_CTRL, ENABLE);
+}
+
+static void imx8mp_hdmi_pai_disable(struct dw_hdmi *dw_hdmi)
+{
+ const struct dw_hdmi_plat_data *pdata = dw_hdmi_to_plat_data(dw_hdmi);
+ struct imx8mp_hdmi_pai *hdmi_pai = (struct imx8mp_hdmi_pai *)pdata->priv_audio;
+
+ /* Stop PAI */
+ regmap_write(hdmi_pai->regmap, HTX_PAI_CTRL, 0);
+}
+
+static int imx8mp_hdmi_pai_bind(struct device *dev, struct device *master, void *data)
+{
+ struct dw_hdmi_plat_data *plat_data = (struct dw_hdmi_plat_data *)data;
+ struct imx8mp_hdmi_pai *hdmi_pai;
+
+ hdmi_pai = dev_get_drvdata(dev);
+
+ plat_data->enable_audio = imx8mp_hdmi_pai_enable;
+ plat_data->disable_audio = imx8mp_hdmi_pai_disable;
+ plat_data->priv_audio = hdmi_pai;
+
+ return 0;
+}
+
+static void imx8mp_hdmi_pai_unbind(struct device *dev, struct device *master, void *data)
+{
+ struct dw_hdmi_plat_data *plat_data = (struct dw_hdmi_plat_data *)data;
+
+ plat_data->enable_audio = NULL;
+ plat_data->disable_audio = NULL;
+ plat_data->priv_audio = NULL;
+}
+
+static const struct component_ops imx8mp_hdmi_pai_ops = {
+ .bind = imx8mp_hdmi_pai_bind,
+ .unbind = imx8mp_hdmi_pai_unbind,
+};
+
+static bool imx8mp_hdmi_pai_volatile_reg(struct device *dev, unsigned int reg)
+{
+ switch (reg) {
+ case HTX_PAI_IRQ_NOMASK:
+ case HTX_PAI_IRQ_MASKED:
+ return true;
+ default:
+ return false;
+ }
+}
+
+static bool imx8mp_hdmi_pai_writeable_reg(struct device *dev, unsigned int reg)
+{
+ switch (reg) {
+ case HTX_PAI_CTRL:
+ case HTX_PAI_CTRL_EXT:
+ case HTX_PAI_FIELD_CTRL:
+ case HTX_PAI_IRQ_NOMASK:
+ case HTX_PAI_IRQ_MASKED:
+ case HTX_PAI_IRQ_MASK:
+ return true;
+ default:
+ return false;
+ }
+}
+
+static const struct regmap_config imx8mp_hdmi_pai_regmap_config = {
+ .reg_bits = 32,
+ .reg_stride = 4,
+ .val_bits = 32,
+ .max_register = HTX_PAI_IRQ_MASK,
+ .volatile_reg = imx8mp_hdmi_pai_volatile_reg,
+ .writeable_reg = imx8mp_hdmi_pai_writeable_reg,
+};
+
+static int imx8mp_hdmi_pai_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct imx8mp_hdmi_pai *hdmi_pai;
+ struct resource *res;
+ void __iomem *base;
+
+ hdmi_pai = devm_kzalloc(dev, sizeof(*hdmi_pai), GFP_KERNEL);
+ if (!hdmi_pai)
+ return -ENOMEM;
+
+ base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
+ if (IS_ERR(base))
+ return PTR_ERR(base);
+
+ hdmi_pai->dev = dev;
+
+ hdmi_pai->regmap = devm_regmap_init_mmio(dev, base, &imx8mp_hdmi_pai_regmap_config);
+ if (IS_ERR(hdmi_pai->regmap)) {
+ dev_err(dev, "regmap init failed\n");
+ return PTR_ERR(hdmi_pai->regmap);
+ }
+
+ dev_set_drvdata(dev, hdmi_pai);
+
+ return component_add(dev, &imx8mp_hdmi_pai_ops);
+}
+
+static void imx8mp_hdmi_pai_remove(struct platform_device *pdev)
+{
+ component_del(&pdev->dev, &imx8mp_hdmi_pai_ops);
+}
+
+static const struct of_device_id imx8mp_hdmi_pai_of_table[] = {
+ { .compatible = "fsl,imx8mp-hdmi-pai" },
+ { /* Sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, imx8mp_hdmi_pai_of_table);
+
+static struct platform_driver imx8mp_hdmi_pai_platform_driver = {
+ .probe = imx8mp_hdmi_pai_probe,
+ .remove = imx8mp_hdmi_pai_remove,
+ .driver = {
+ .name = "imx8mp-hdmi-pai",
+ .of_match_table = imx8mp_hdmi_pai_of_table,
+ },
+};
+module_platform_driver(imx8mp_hdmi_pai_platform_driver);
+
+MODULE_DESCRIPTION("i.MX8MP HDMI PAI driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c
index 1e7a789ec289..ee08084d2394 100644
--- a/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c
+++ b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c
@@ -5,11 +5,13 @@
*/
#include <linux/clk.h>
+#include <linux/component.h>
#include <linux/mod_devicetable.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <drm/bridge/dw_hdmi.h>
#include <drm/drm_modes.h>
+#include <drm/drm_of.h>
struct imx8mp_hdmi {
struct dw_hdmi_plat_data plat_data;
@@ -79,11 +81,46 @@ static const struct dw_hdmi_phy_ops imx8mp_hdmi_phy_ops = {
.update_hpd = dw_hdmi_phy_update_hpd,
};
+static int imx8mp_dw_hdmi_bind(struct device *dev)
+{
+ struct dw_hdmi_plat_data *plat_data;
+ struct imx8mp_hdmi *hdmi;
+ int ret;
+
+ hdmi = dev_get_drvdata(dev);
+ plat_data = &hdmi->plat_data;
+
+ ret = component_bind_all(dev, plat_data);
+ if (ret)
+ return dev_err_probe(dev, ret, "component_bind_all failed!\n");
+
+ return 0;
+}
+
+static void imx8mp_dw_hdmi_unbind(struct device *dev)
+{
+ struct dw_hdmi_plat_data *plat_data;
+ struct imx8mp_hdmi *hdmi;
+
+ hdmi = dev_get_drvdata(dev);
+ plat_data = &hdmi->plat_data;
+
+ component_unbind_all(dev, plat_data);
+}
+
+static const struct component_master_ops imx8mp_dw_hdmi_ops = {
+ .bind = imx8mp_dw_hdmi_bind,
+ .unbind = imx8mp_dw_hdmi_unbind,
+};
+
static int imx8mp_dw_hdmi_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct dw_hdmi_plat_data *plat_data;
+ struct component_match *match;
+ struct device_node *remote;
struct imx8mp_hdmi *hdmi;
+ int ret;
hdmi = devm_kzalloc(dev, sizeof(*hdmi), GFP_KERNEL);
if (!hdmi)
@@ -108,6 +145,22 @@ static int imx8mp_dw_hdmi_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, hdmi);
+ /* port@2 is for hdmi_pai device */
+ remote = of_graph_get_remote_node(pdev->dev.of_node, 2, 0);
+ if (remote && of_device_is_available(remote)) {
+ drm_of_component_match_add(dev, &match, component_compare_of, remote);
+
+ of_node_put(remote);
+
+ ret = component_master_add_with_match(dev, &imx8mp_dw_hdmi_ops, match);
+ if (ret)
+ dev_warn(dev, "Unable to register aggregate driver\n");
+ /*
+ * This audio function is optional for avoid blocking display.
+ * So just print warning message and no error is returned.
+ */
+ }
+
return 0;
}
@@ -115,6 +168,8 @@ static void imx8mp_dw_hdmi_remove(struct platform_device *pdev)
{
struct imx8mp_hdmi *hdmi = platform_get_drvdata(pdev);
+ component_master_del(&pdev->dev, &imx8mp_dw_hdmi_ops);
+
dw_hdmi_remove(hdmi->dw_hdmi);
}
diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h
index 095cdd9b7424..336f062e1f9d 100644
--- a/include/drm/bridge/dw_hdmi.h
+++ b/include/drm/bridge/dw_hdmi.h
@@ -143,6 +143,12 @@ struct dw_hdmi_plat_data {
const struct drm_display_info *info,
const struct drm_display_mode *mode);
+ /*
+ * priv_audio is specially used for additional audio device to get
+ * driver data through this dw_hdmi_plat_data.
+ */
+ void *priv_audio;
+
/* Platform-specific audio enable/disable (optional) */
void (*enable_audio)(struct dw_hdmi *hdmi, int channel,
int width, int rate, int non_pcm, int iec958);
--
2.34.1On 08/04/2025, Shengjiu Wang wrote:
> The HDMI TX Parallel Audio Interface (HTX_PAI) is a digital module that
> acts as the bridge between the Audio Subsystem to the HDMI TX Controller.
> This IP block is found in the HDMI subsystem of the i.MX8MP SoC.
>
> Data received from the audio subsystem can have an arbitrary component
> ordering. The HTX_PAI block has integrated muxing options to select which
> sections of the 32-bit input data word will be mapped to each IEC60958
> field. The HTX_PAI_FIELD_CTRL register contains mux selects to
> individually select P,C,U,V,Data, and Preamble.
>
> Use component helper that imx8mp-hdmi-tx will be aggregate driver,
s/that/so that/
> imx8mp-hdmi-pai will be component driver, then imx8mp-hdmi-pai can use
> bind() ops to get the plat_data from imx8mp-hdmi-tx device.
>
> Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
> ---
> drivers/gpu/drm/bridge/imx/Kconfig | 8 +
> drivers/gpu/drm/bridge/imx/Makefile | 1 +
> drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c | 205 +++++++++++++++++++
> drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c | 55 +++++
> include/drm/bridge/dw_hdmi.h | 6 +
> 5 files changed, 275 insertions(+)
> create mode 100644 drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c
>
> diff --git a/drivers/gpu/drm/bridge/imx/Kconfig b/drivers/gpu/drm/bridge/imx/Kconfig
> index 9a480c6abb85..6c1a8bc5d4a0 100644
> --- a/drivers/gpu/drm/bridge/imx/Kconfig
> +++ b/drivers/gpu/drm/bridge/imx/Kconfig
> @@ -18,12 +18,20 @@ config DRM_IMX8MP_DW_HDMI_BRIDGE
> depends on OF
> depends on COMMON_CLK
> select DRM_DW_HDMI
> + imply DRM_IMX8MP_HDMI_PAI
> imply DRM_IMX8MP_HDMI_PVI
> imply PHY_FSL_SAMSUNG_HDMI_PHY
> help
> Choose this to enable support for the internal HDMI encoder found
> on the i.MX8MP SoC.
>
> +config DRM_IMX8MP_HDMI_PAI
> + tristate "Freescale i.MX8MP HDMI PAI bridge support"
> + depends on OF
select REGMAP
select REGMAP_MMIO
> + help
> + Choose this to enable support for the internal HDMI TX Parallel
> + Audio Interface found on the Freescale i.MX8MP SoC.
> +
> config DRM_IMX8MP_HDMI_PVI
> tristate "Freescale i.MX8MP HDMI PVI bridge support"
> depends on OF
> diff --git a/drivers/gpu/drm/bridge/imx/Makefile b/drivers/gpu/drm/bridge/imx/Makefile
> index dd5d48584806..8d01fda25451 100644
> --- a/drivers/gpu/drm/bridge/imx/Makefile
> +++ b/drivers/gpu/drm/bridge/imx/Makefile
> @@ -1,6 +1,7 @@
> obj-$(CONFIG_DRM_IMX_LDB_HELPER) += imx-ldb-helper.o
> obj-$(CONFIG_DRM_IMX_LEGACY_BRIDGE) += imx-legacy-bridge.o
> obj-$(CONFIG_DRM_IMX8MP_DW_HDMI_BRIDGE) += imx8mp-hdmi-tx.o
> +obj-$(CONFIG_DRM_IMX8MP_HDMI_PAI) += imx8mp-hdmi-pai.o
> obj-$(CONFIG_DRM_IMX8MP_HDMI_PVI) += imx8mp-hdmi-pvi.o
> obj-$(CONFIG_DRM_IMX8QM_LDB) += imx8qm-ldb.o
> obj-$(CONFIG_DRM_IMX8QXP_LDB) += imx8qxp-ldb.o
> diff --git a/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c
> new file mode 100644
> index 000000000000..9002974073ca
> --- /dev/null
> +++ b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c
> @@ -0,0 +1,205 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright 2025 NXP
> + */
> +
> +#include <linux/bitfield.h>
> +#include <linux/component.h>
> +#include <linux/module.h>
> +#include <linux/of_platform.h>
> +#include <linux/platform_device.h>
#include <linux/regmap.h>
> +#include <drm/bridge/dw_hdmi.h>
> +#include <sound/asoundef.h>
> +
> +#define HTX_PAI_CTRL 0x00
> +#define ENABLE BIT(0)
> +
> +#define HTX_PAI_CTRL_EXT 0x04
> +#define WTMK_HIGH_MASK GENMASK(31, 24)
> +#define WTMK_LOW_MASK GENMASK(23, 16)
> +#define NUM_CH_MASK GENMASK(10, 8)
Add NUM_CH(n) and use it when programming HTX_PAI_CTRL_EXT.
#define NUM_CH(n) FIELD_PREP(NUM_CH_MASK, (n - 1))
> +#define WTMK_HIGH(n) FIELD_PREP(WTMK_HIGH_MASK, (n))
> +#define WTMK_LOW(n) FIELD_PREP(WTMK_LOW_MASK, (n))
> +
> +#define HTX_PAI_FIELD_CTRL 0x08
> +#define B_FILT BIT(31)
> +#define PARITY_EN BIT(30)
> +#define END_SEL BIT(29)
The above 3 bits are unused. Drop.
> +#define PRE_SEL GENMASK(28, 24)
> +#define D_SEL GENMASK(23, 20)
> +#define V_SEL GENMASK(19, 15)
> +#define U_SEL GENMASK(14, 10)
> +#define C_SEL GENMASK(9, 5)
> +#define P_SEL GENMASK(4, 0)
> +
> +#define HTX_PAI_STAT 0x0c
> +#define HTX_PAI_IRQ_NOMASK 0x10
> +#define HTX_PAI_IRQ_MASKED 0x14
> +#define HTX_PAI_IRQ_MASK 0x18
The above 4 registers are not pratically used. Drop.
> +
> +struct imx8mp_hdmi_pai {
> + struct device *dev;
> + struct regmap *regmap;
> +};
> +
> +static void imx8mp_hdmi_pai_enable(struct dw_hdmi *dw_hdmi, int channel,
> + int width, int rate, int non_pcm,
> + int iec958)
> +{
> + const struct dw_hdmi_plat_data *pdata = dw_hdmi_to_plat_data(dw_hdmi);
> + struct imx8mp_hdmi_pai *hdmi_pai = (struct imx8mp_hdmi_pai *)pdata->priv_audio;
I don't think you need to convert type explicitly. Same for the other
explicit conversions in this driver.
> + int val;
> +
> + /* PAI set control extended */
> + val = WTMK_HIGH(3) | WTMK_LOW(3);
> + val |= FIELD_PREP(NUM_CH_MASK, channel - 1);
> + regmap_write(hdmi_pai->regmap, HTX_PAI_CTRL_EXT, val);
> +
> + /* IEC60958 format */
> + if (iec958) {
> + val = FIELD_PREP_CONST(P_SEL,
> + __bf_shf(IEC958_SUBFRAME_PARITY));
> + val |= FIELD_PREP_CONST(C_SEL,
> + __bf_shf(IEC958_SUBFRAME_CHANNEL_STATUS));
> + val |= FIELD_PREP_CONST(U_SEL,
> + __bf_shf(IEC958_SUBFRAME_USER_DATA));
> + val |= FIELD_PREP_CONST(V_SEL,
> + __bf_shf(IEC958_SUBFRAME_VALIDITY));
> + val |= FIELD_PREP_CONST(D_SEL,
> + __bf_shf(IEC958_SUBFRAME_SAMPLE_24_MASK));
> + val |= FIELD_PREP_CONST(PRE_SEL,
> + __bf_shf(IEC958_SUBFRAME_PREAMBLE_MASK));
> + } else {
> + /* PCM choose 24bit*/
> + val = FIELD_PREP(D_SEL, width - 24);
Why 'width - 24'? Can it be expressed by a helper or macro?
> + }
> +
> + regmap_write(hdmi_pai->regmap, HTX_PAI_FIELD_CTRL, val);
> +
> + /* PAI start running */
> + regmap_write(hdmi_pai->regmap, HTX_PAI_CTRL, ENABLE);
> +}
> +
> +static void imx8mp_hdmi_pai_disable(struct dw_hdmi *dw_hdmi)
> +{
> + const struct dw_hdmi_plat_data *pdata = dw_hdmi_to_plat_data(dw_hdmi);
> + struct imx8mp_hdmi_pai *hdmi_pai = (struct imx8mp_hdmi_pai *)pdata->priv_audio;
> +
> + /* Stop PAI */
> + regmap_write(hdmi_pai->regmap, HTX_PAI_CTRL, 0);
> +}
> +
> +static int imx8mp_hdmi_pai_bind(struct device *dev, struct device *master, void *data)
> +{
> + struct dw_hdmi_plat_data *plat_data = (struct dw_hdmi_plat_data *)data;
> + struct imx8mp_hdmi_pai *hdmi_pai;
> +
> + hdmi_pai = dev_get_drvdata(dev);
> +
> + plat_data->enable_audio = imx8mp_hdmi_pai_enable;
> + plat_data->disable_audio = imx8mp_hdmi_pai_disable;
> + plat_data->priv_audio = hdmi_pai;
> +
> + return 0;
> +}
> +
> +static void imx8mp_hdmi_pai_unbind(struct device *dev, struct device *master, void *data)
> +{
> + struct dw_hdmi_plat_data *plat_data = (struct dw_hdmi_plat_data *)data;
> +
> + plat_data->enable_audio = NULL;
> + plat_data->disable_audio = NULL;
> + plat_data->priv_audio = NULL;
Do you really need to set these ptrs to NULL?
> +}
> +
> +static const struct component_ops imx8mp_hdmi_pai_ops = {
> + .bind = imx8mp_hdmi_pai_bind,
> + .unbind = imx8mp_hdmi_pai_unbind,
> +};
> +
> +static bool imx8mp_hdmi_pai_volatile_reg(struct device *dev, unsigned int reg)
> +{
> + switch (reg) {
> + case HTX_PAI_IRQ_NOMASK:
> + case HTX_PAI_IRQ_MASKED:
> + return true;
> + default:
> + return false;
> + }
> +}
> +
> +static bool imx8mp_hdmi_pai_writeable_reg(struct device *dev, unsigned int reg)
> +{
> + switch (reg) {
> + case HTX_PAI_CTRL:
> + case HTX_PAI_CTRL_EXT:
> + case HTX_PAI_FIELD_CTRL:
> + case HTX_PAI_IRQ_NOMASK:
> + case HTX_PAI_IRQ_MASKED:
> + case HTX_PAI_IRQ_MASK:
> + return true;
> + default:
> + return false;
> + }
> +}
> +
> +static const struct regmap_config imx8mp_hdmi_pai_regmap_config = {
> + .reg_bits = 32,
> + .reg_stride = 4,
> + .val_bits = 32,
> + .max_register = HTX_PAI_IRQ_MASK,
> + .volatile_reg = imx8mp_hdmi_pai_volatile_reg,
> + .writeable_reg = imx8mp_hdmi_pai_writeable_reg,
> +};
> +
> +static int imx8mp_hdmi_pai_probe(struct platform_device *pdev)
> +{
> + struct device *dev = &pdev->dev;
> + struct imx8mp_hdmi_pai *hdmi_pai;
> + struct resource *res;
> + void __iomem *base;
> +
> + hdmi_pai = devm_kzalloc(dev, sizeof(*hdmi_pai), GFP_KERNEL);
> + if (!hdmi_pai)
> + return -ENOMEM;
> +
> + base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
> + if (IS_ERR(base))
> + return PTR_ERR(base);
> +
> + hdmi_pai->dev = dev;
> +
> + hdmi_pai->regmap = devm_regmap_init_mmio(dev, base, &imx8mp_hdmi_pai_regmap_config);
Now that DT binding says there is an APB clock, use devm_regmap_init_mmio_clk()
to ensure registers can be accessed with clock enabled even via debugfs.
> + if (IS_ERR(hdmi_pai->regmap)) {
> + dev_err(dev, "regmap init failed\n");
> + return PTR_ERR(hdmi_pai->regmap);
> + }
> +
> + dev_set_drvdata(dev, hdmi_pai);
> +
> + return component_add(dev, &imx8mp_hdmi_pai_ops);
Imagine that users could enable this driver without enabling imx8mp-hdmi-tx
driver, you may add the component in this probe() callback only and move all
the other stuff to bind() callback to avoid unnecessary things being done here.
> +}
> +
> +static void imx8mp_hdmi_pai_remove(struct platform_device *pdev)
> +{
> + component_del(&pdev->dev, &imx8mp_hdmi_pai_ops);
> +}
> +
> +static const struct of_device_id imx8mp_hdmi_pai_of_table[] = {
> + { .compatible = "fsl,imx8mp-hdmi-pai" },
> + { /* Sentinel */ }
> +};
> +MODULE_DEVICE_TABLE(of, imx8mp_hdmi_pai_of_table);
> +
> +static struct platform_driver imx8mp_hdmi_pai_platform_driver = {
> + .probe = imx8mp_hdmi_pai_probe,
> + .remove = imx8mp_hdmi_pai_remove,
> + .driver = {
> + .name = "imx8mp-hdmi-pai",
> + .of_match_table = imx8mp_hdmi_pai_of_table,
> + },
> +};
> +module_platform_driver(imx8mp_hdmi_pai_platform_driver);
> +
> +MODULE_DESCRIPTION("i.MX8MP HDMI PAI driver");
> +MODULE_LICENSE("GPL");
> diff --git a/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c
> index 1e7a789ec289..ee08084d2394 100644
> --- a/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c
> +++ b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c
> @@ -5,11 +5,13 @@
> */
>
> #include <linux/clk.h>
> +#include <linux/component.h>
> #include <linux/mod_devicetable.h>
> #include <linux/module.h>
> #include <linux/platform_device.h>
> #include <drm/bridge/dw_hdmi.h>
> #include <drm/drm_modes.h>
> +#include <drm/drm_of.h>
>
> struct imx8mp_hdmi {
> struct dw_hdmi_plat_data plat_data;
> @@ -79,11 +81,46 @@ static const struct dw_hdmi_phy_ops imx8mp_hdmi_phy_ops = {
> .update_hpd = dw_hdmi_phy_update_hpd,
> };
>
> +static int imx8mp_dw_hdmi_bind(struct device *dev)
> +{
> + struct dw_hdmi_plat_data *plat_data;
> + struct imx8mp_hdmi *hdmi;
> + int ret;
> +
> + hdmi = dev_get_drvdata(dev);
> + plat_data = &hdmi->plat_data;
> +
> + ret = component_bind_all(dev, plat_data);
> + if (ret)
> + return dev_err_probe(dev, ret, "component_bind_all failed!\n");
As component_bind_all() would bind imx8mp-hdmi-pai and hence set
{enable,disable}_audio callbacks, you need to call dw_hdmi_probe() after
component_bind_all() instead of too early in probe() callback.
> +
> + return 0;
> +}
> +
> +static void imx8mp_dw_hdmi_unbind(struct device *dev)
> +{
> + struct dw_hdmi_plat_data *plat_data;
> + struct imx8mp_hdmi *hdmi;
> +
> + hdmi = dev_get_drvdata(dev);
> + plat_data = &hdmi->plat_data;
> +
> + component_unbind_all(dev, plat_data);
> +}
> +
> +static const struct component_master_ops imx8mp_dw_hdmi_ops = {
> + .bind = imx8mp_dw_hdmi_bind,
> + .unbind = imx8mp_dw_hdmi_unbind,
> +};
> +
> static int imx8mp_dw_hdmi_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> struct dw_hdmi_plat_data *plat_data;
> + struct component_match *match;
As Alexander pointed out, this needs to be set to NULL.
See how other drivers which are component masters do.
> + struct device_node *remote;
> struct imx8mp_hdmi *hdmi;
> + int ret;
>
> hdmi = devm_kzalloc(dev, sizeof(*hdmi), GFP_KERNEL);
> if (!hdmi)
> @@ -108,6 +145,22 @@ static int imx8mp_dw_hdmi_probe(struct platform_device *pdev)
>
> platform_set_drvdata(pdev, hdmi);
>
> + /* port@2 is for hdmi_pai device */
> + remote = of_graph_get_remote_node(pdev->dev.of_node, 2, 0);
> + if (remote && of_device_is_available(remote)) {
Doesn't of_graph_get_remote_node() ensure that remote is avaiable?
> + drm_of_component_match_add(dev, &match, component_compare_of, remote);
> +
> + of_node_put(remote);
> +
> + ret = component_master_add_with_match(dev, &imx8mp_dw_hdmi_ops, match);
> + if (ret)
> + dev_warn(dev, "Unable to register aggregate driver\n");
> + /*
> + * This audio function is optional for avoid blocking display.
> + * So just print warning message and no error is returned.
No, since PAI node is available here, it has to be bound. Yet you still need
to properly handle the case where PAI node is inavailable.
> + */
> + }
> +
> return 0;
> }
>
> @@ -115,6 +168,8 @@ static void imx8mp_dw_hdmi_remove(struct platform_device *pdev)
> {
> struct imx8mp_hdmi *hdmi = platform_get_drvdata(pdev);
>
> + component_master_del(&pdev->dev, &imx8mp_dw_hdmi_ops);
> +
> dw_hdmi_remove(hdmi->dw_hdmi);
> }
>
> diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h
> index 095cdd9b7424..336f062e1f9d 100644
> --- a/include/drm/bridge/dw_hdmi.h
> +++ b/include/drm/bridge/dw_hdmi.h
> @@ -143,6 +143,12 @@ struct dw_hdmi_plat_data {
> const struct drm_display_info *info,
> const struct drm_display_mode *mode);
>
> + /*
> + * priv_audio is specially used for additional audio device to get
> + * driver data through this dw_hdmi_plat_data.
> + */
> + void *priv_audio;
> +
> /* Platform-specific audio enable/disable (optional) */
> void (*enable_audio)(struct dw_hdmi *hdmi, int channel,
> int width, int rate, int non_pcm, int iec958);
--
Regards,
Liu Ying
On Tue, Aug 5, 2025 at 4:55 PM Liu Ying <victor.liu@nxp.com> wrote:
>
> On 08/04/2025, Shengjiu Wang wrote:
> > The HDMI TX Parallel Audio Interface (HTX_PAI) is a digital module that
> > acts as the bridge between the Audio Subsystem to the HDMI TX Controller.
> > This IP block is found in the HDMI subsystem of the i.MX8MP SoC.
> >
> > Data received from the audio subsystem can have an arbitrary component
> > ordering. The HTX_PAI block has integrated muxing options to select which
> > sections of the 32-bit input data word will be mapped to each IEC60958
> > field. The HTX_PAI_FIELD_CTRL register contains mux selects to
> > individually select P,C,U,V,Data, and Preamble.
> >
> > Use component helper that imx8mp-hdmi-tx will be aggregate driver,
>
> s/that/so that/
>
> > imx8mp-hdmi-pai will be component driver, then imx8mp-hdmi-pai can use
> > bind() ops to get the plat_data from imx8mp-hdmi-tx device.
> >
> > Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
> > ---
> > drivers/gpu/drm/bridge/imx/Kconfig | 8 +
> > drivers/gpu/drm/bridge/imx/Makefile | 1 +
> > drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c | 205 +++++++++++++++++++
> > drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c | 55 +++++
> > include/drm/bridge/dw_hdmi.h | 6 +
> > 5 files changed, 275 insertions(+)
> > create mode 100644 drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c
> >
> > diff --git a/drivers/gpu/drm/bridge/imx/Kconfig b/drivers/gpu/drm/bridge/imx/Kconfig
> > index 9a480c6abb85..6c1a8bc5d4a0 100644
> > --- a/drivers/gpu/drm/bridge/imx/Kconfig
> > +++ b/drivers/gpu/drm/bridge/imx/Kconfig
> > @@ -18,12 +18,20 @@ config DRM_IMX8MP_DW_HDMI_BRIDGE
> > depends on OF
> > depends on COMMON_CLK
> > select DRM_DW_HDMI
> > + imply DRM_IMX8MP_HDMI_PAI
> > imply DRM_IMX8MP_HDMI_PVI
> > imply PHY_FSL_SAMSUNG_HDMI_PHY
> > help
> > Choose this to enable support for the internal HDMI encoder found
> > on the i.MX8MP SoC.
> >
> > +config DRM_IMX8MP_HDMI_PAI
> > + tristate "Freescale i.MX8MP HDMI PAI bridge support"
> > + depends on OF
>
> select REGMAP
> select REGMAP_MMIO
>
> > + help
> > + Choose this to enable support for the internal HDMI TX Parallel
> > + Audio Interface found on the Freescale i.MX8MP SoC.
> > +
> > config DRM_IMX8MP_HDMI_PVI
> > tristate "Freescale i.MX8MP HDMI PVI bridge support"
> > depends on OF
> > diff --git a/drivers/gpu/drm/bridge/imx/Makefile b/drivers/gpu/drm/bridge/imx/Makefile
> > index dd5d48584806..8d01fda25451 100644
> > --- a/drivers/gpu/drm/bridge/imx/Makefile
> > +++ b/drivers/gpu/drm/bridge/imx/Makefile
> > @@ -1,6 +1,7 @@
> > obj-$(CONFIG_DRM_IMX_LDB_HELPER) += imx-ldb-helper.o
> > obj-$(CONFIG_DRM_IMX_LEGACY_BRIDGE) += imx-legacy-bridge.o
> > obj-$(CONFIG_DRM_IMX8MP_DW_HDMI_BRIDGE) += imx8mp-hdmi-tx.o
> > +obj-$(CONFIG_DRM_IMX8MP_HDMI_PAI) += imx8mp-hdmi-pai.o
> > obj-$(CONFIG_DRM_IMX8MP_HDMI_PVI) += imx8mp-hdmi-pvi.o
> > obj-$(CONFIG_DRM_IMX8QM_LDB) += imx8qm-ldb.o
> > obj-$(CONFIG_DRM_IMX8QXP_LDB) += imx8qxp-ldb.o
> > diff --git a/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c
> > new file mode 100644
> > index 000000000000..9002974073ca
> > --- /dev/null
> > +++ b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c
> > @@ -0,0 +1,205 @@
> > +// SPDX-License-Identifier: GPL-2.0+
> > +/*
> > + * Copyright 2025 NXP
> > + */
> > +
> > +#include <linux/bitfield.h>
> > +#include <linux/component.h>
> > +#include <linux/module.h>
> > +#include <linux/of_platform.h>
> > +#include <linux/platform_device.h>
>
> #include <linux/regmap.h>
>
> > +#include <drm/bridge/dw_hdmi.h>
> > +#include <sound/asoundef.h>
> > +
> > +#define HTX_PAI_CTRL 0x00
> > +#define ENABLE BIT(0)
> > +
> > +#define HTX_PAI_CTRL_EXT 0x04
> > +#define WTMK_HIGH_MASK GENMASK(31, 24)
> > +#define WTMK_LOW_MASK GENMASK(23, 16)
> > +#define NUM_CH_MASK GENMASK(10, 8)
>
> Add NUM_CH(n) and use it when programming HTX_PAI_CTRL_EXT.
> #define NUM_CH(n) FIELD_PREP(NUM_CH_MASK, (n - 1))
>
> > +#define WTMK_HIGH(n) FIELD_PREP(WTMK_HIGH_MASK, (n))
> > +#define WTMK_LOW(n) FIELD_PREP(WTMK_LOW_MASK, (n))
> > +
> > +#define HTX_PAI_FIELD_CTRL 0x08
> > +#define B_FILT BIT(31)
> > +#define PARITY_EN BIT(30)
> > +#define END_SEL BIT(29)
>
> The above 3 bits are unused. Drop.
>
> > +#define PRE_SEL GENMASK(28, 24)
> > +#define D_SEL GENMASK(23, 20)
> > +#define V_SEL GENMASK(19, 15)
> > +#define U_SEL GENMASK(14, 10)
> > +#define C_SEL GENMASK(9, 5)
> > +#define P_SEL GENMASK(4, 0)
> > +
> > +#define HTX_PAI_STAT 0x0c
> > +#define HTX_PAI_IRQ_NOMASK 0x10
> > +#define HTX_PAI_IRQ_MASKED 0x14
> > +#define HTX_PAI_IRQ_MASK 0x18
>
> The above 4 registers are not pratically used. Drop.
>
> > +
> > +struct imx8mp_hdmi_pai {
> > + struct device *dev;
> > + struct regmap *regmap;
> > +};
> > +
> > +static void imx8mp_hdmi_pai_enable(struct dw_hdmi *dw_hdmi, int channel,
> > + int width, int rate, int non_pcm,
> > + int iec958)
> > +{
> > + const struct dw_hdmi_plat_data *pdata = dw_hdmi_to_plat_data(dw_hdmi);
> > + struct imx8mp_hdmi_pai *hdmi_pai = (struct imx8mp_hdmi_pai *)pdata->priv_audio;
>
> I don't think you need to convert type explicitly. Same for the other
> explicit conversions in this driver.
>
> > + int val;
> > +
> > + /* PAI set control extended */
> > + val = WTMK_HIGH(3) | WTMK_LOW(3);
> > + val |= FIELD_PREP(NUM_CH_MASK, channel - 1);
> > + regmap_write(hdmi_pai->regmap, HTX_PAI_CTRL_EXT, val);
> > +
> > + /* IEC60958 format */
> > + if (iec958) {
> > + val = FIELD_PREP_CONST(P_SEL,
> > + __bf_shf(IEC958_SUBFRAME_PARITY));
> > + val |= FIELD_PREP_CONST(C_SEL,
> > + __bf_shf(IEC958_SUBFRAME_CHANNEL_STATUS));
> > + val |= FIELD_PREP_CONST(U_SEL,
> > + __bf_shf(IEC958_SUBFRAME_USER_DATA));
> > + val |= FIELD_PREP_CONST(V_SEL,
> > + __bf_shf(IEC958_SUBFRAME_VALIDITY));
> > + val |= FIELD_PREP_CONST(D_SEL,
> > + __bf_shf(IEC958_SUBFRAME_SAMPLE_24_MASK));
> > + val |= FIELD_PREP_CONST(PRE_SEL,
> > + __bf_shf(IEC958_SUBFRAME_PREAMBLE_MASK));
> > + } else {
> > + /* PCM choose 24bit*/
> > + val = FIELD_PREP(D_SEL, width - 24);
>
> Why 'width - 24'? Can it be expressed by a helper or macro?
>
> > + }
> > +
> > + regmap_write(hdmi_pai->regmap, HTX_PAI_FIELD_CTRL, val);
> > +
> > + /* PAI start running */
> > + regmap_write(hdmi_pai->regmap, HTX_PAI_CTRL, ENABLE);
> > +}
> > +
> > +static void imx8mp_hdmi_pai_disable(struct dw_hdmi *dw_hdmi)
> > +{
> > + const struct dw_hdmi_plat_data *pdata = dw_hdmi_to_plat_data(dw_hdmi);
> > + struct imx8mp_hdmi_pai *hdmi_pai = (struct imx8mp_hdmi_pai *)pdata->priv_audio;
> > +
> > + /* Stop PAI */
> > + regmap_write(hdmi_pai->regmap, HTX_PAI_CTRL, 0);
> > +}
> > +
> > +static int imx8mp_hdmi_pai_bind(struct device *dev, struct device *master, void *data)
> > +{
> > + struct dw_hdmi_plat_data *plat_data = (struct dw_hdmi_plat_data *)data;
> > + struct imx8mp_hdmi_pai *hdmi_pai;
> > +
> > + hdmi_pai = dev_get_drvdata(dev);
> > +
> > + plat_data->enable_audio = imx8mp_hdmi_pai_enable;
> > + plat_data->disable_audio = imx8mp_hdmi_pai_disable;
> > + plat_data->priv_audio = hdmi_pai;
> > +
> > + return 0;
> > +}
> > +
> > +static void imx8mp_hdmi_pai_unbind(struct device *dev, struct device *master, void *data)
> > +{
> > + struct dw_hdmi_plat_data *plat_data = (struct dw_hdmi_plat_data *)data;
> > +
> > + plat_data->enable_audio = NULL;
> > + plat_data->disable_audio = NULL;
> > + plat_data->priv_audio = NULL;
>
> Do you really need to set these ptrs to NULL?
yes. below code in dw-hdmi.c use the pdata->enable_audio as condition.
if (pdata->enable_audio)
pdata->enable_audio(hdmi,
hdmi->channels,
hdmi->sample_width,
hdmi->sample_rate,
hdmi->sample_non_pcm,
hdmi->sample_iec958);
>
> > +}
> > +
> > +static const struct component_ops imx8mp_hdmi_pai_ops = {
> > + .bind = imx8mp_hdmi_pai_bind,
> > + .unbind = imx8mp_hdmi_pai_unbind,
> > +};
> > +
> > +static bool imx8mp_hdmi_pai_volatile_reg(struct device *dev, unsigned int reg)
> > +{
> > + switch (reg) {
> > + case HTX_PAI_IRQ_NOMASK:
> > + case HTX_PAI_IRQ_MASKED:
> > + return true;
> > + default:
> > + return false;
> > + }
> > +}
> > +
> > +static bool imx8mp_hdmi_pai_writeable_reg(struct device *dev, unsigned int reg)
> > +{
> > + switch (reg) {
> > + case HTX_PAI_CTRL:
> > + case HTX_PAI_CTRL_EXT:
> > + case HTX_PAI_FIELD_CTRL:
> > + case HTX_PAI_IRQ_NOMASK:
> > + case HTX_PAI_IRQ_MASKED:
> > + case HTX_PAI_IRQ_MASK:
> > + return true;
> > + default:
> > + return false;
> > + }
> > +}
> > +
> > +static const struct regmap_config imx8mp_hdmi_pai_regmap_config = {
> > + .reg_bits = 32,
> > + .reg_stride = 4,
> > + .val_bits = 32,
> > + .max_register = HTX_PAI_IRQ_MASK,
> > + .volatile_reg = imx8mp_hdmi_pai_volatile_reg,
> > + .writeable_reg = imx8mp_hdmi_pai_writeable_reg,
> > +};
> > +
> > +static int imx8mp_hdmi_pai_probe(struct platform_device *pdev)
> > +{
> > + struct device *dev = &pdev->dev;
> > + struct imx8mp_hdmi_pai *hdmi_pai;
> > + struct resource *res;
> > + void __iomem *base;
> > +
> > + hdmi_pai = devm_kzalloc(dev, sizeof(*hdmi_pai), GFP_KERNEL);
> > + if (!hdmi_pai)
> > + return -ENOMEM;
> > +
> > + base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
> > + if (IS_ERR(base))
> > + return PTR_ERR(base);
> > +
> > + hdmi_pai->dev = dev;
> > +
> > + hdmi_pai->regmap = devm_regmap_init_mmio(dev, base, &imx8mp_hdmi_pai_regmap_config);
>
> Now that DT binding says there is an APB clock, use devm_regmap_init_mmio_clk()
> to ensure registers can be accessed with clock enabled even via debugfs.
>
> > + if (IS_ERR(hdmi_pai->regmap)) {
> > + dev_err(dev, "regmap init failed\n");
> > + return PTR_ERR(hdmi_pai->regmap);
> > + }
> > +
> > + dev_set_drvdata(dev, hdmi_pai);
> > +
> > + return component_add(dev, &imx8mp_hdmi_pai_ops);
>
> Imagine that users could enable this driver without enabling imx8mp-hdmi-tx
> driver, you may add the component in this probe() callback only and move all
> the other stuff to bind() callback to avoid unnecessary things being done here.
component helper functions don't have such dependency that the aggregate
driver or component driver must be probed or not. if imx8mp-hdmi-tx is not
enabled, there is no problem, just the bind() callback is not called.
>
> > +}
> > +
> > +static void imx8mp_hdmi_pai_remove(struct platform_device *pdev)
> > +{
> > + component_del(&pdev->dev, &imx8mp_hdmi_pai_ops);
> > +}
> > +
> > +static const struct of_device_id imx8mp_hdmi_pai_of_table[] = {
> > + { .compatible = "fsl,imx8mp-hdmi-pai" },
> > + { /* Sentinel */ }
> > +};
> > +MODULE_DEVICE_TABLE(of, imx8mp_hdmi_pai_of_table);
> > +
> > +static struct platform_driver imx8mp_hdmi_pai_platform_driver = {
> > + .probe = imx8mp_hdmi_pai_probe,
> > + .remove = imx8mp_hdmi_pai_remove,
> > + .driver = {
> > + .name = "imx8mp-hdmi-pai",
> > + .of_match_table = imx8mp_hdmi_pai_of_table,
> > + },
> > +};
> > +module_platform_driver(imx8mp_hdmi_pai_platform_driver);
> > +
> > +MODULE_DESCRIPTION("i.MX8MP HDMI PAI driver");
> > +MODULE_LICENSE("GPL");
> > diff --git a/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c
> > index 1e7a789ec289..ee08084d2394 100644
> > --- a/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c
> > +++ b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c
> > @@ -5,11 +5,13 @@
> > */
> >
> > #include <linux/clk.h>
> > +#include <linux/component.h>
> > #include <linux/mod_devicetable.h>
> > #include <linux/module.h>
> > #include <linux/platform_device.h>
> > #include <drm/bridge/dw_hdmi.h>
> > #include <drm/drm_modes.h>
> > +#include <drm/drm_of.h>
> >
> > struct imx8mp_hdmi {
> > struct dw_hdmi_plat_data plat_data;
> > @@ -79,11 +81,46 @@ static const struct dw_hdmi_phy_ops imx8mp_hdmi_phy_ops = {
> > .update_hpd = dw_hdmi_phy_update_hpd,
> > };
> >
> > +static int imx8mp_dw_hdmi_bind(struct device *dev)
> > +{
> > + struct dw_hdmi_plat_data *plat_data;
> > + struct imx8mp_hdmi *hdmi;
> > + int ret;
> > +
> > + hdmi = dev_get_drvdata(dev);
> > + plat_data = &hdmi->plat_data;
> > +
> > + ret = component_bind_all(dev, plat_data);
> > + if (ret)
> > + return dev_err_probe(dev, ret, "component_bind_all failed!\n");
>
> As component_bind_all() would bind imx8mp-hdmi-pai and hence set
> {enable,disable}_audio callbacks, you need to call dw_hdmi_probe() after
> component_bind_all() instead of too early in probe() callback.
There is no such dependency.
Maybe you mixed the hdmi->enable_audio() with pdata->enable_audio().
>
> > +
> > + return 0;
> > +}
> > +
> > +static void imx8mp_dw_hdmi_unbind(struct device *dev)
> > +{
> > + struct dw_hdmi_plat_data *plat_data;
> > + struct imx8mp_hdmi *hdmi;
> > +
> > + hdmi = dev_get_drvdata(dev);
> > + plat_data = &hdmi->plat_data;
> > +
> > + component_unbind_all(dev, plat_data);
> > +}
> > +
> > +static const struct component_master_ops imx8mp_dw_hdmi_ops = {
> > + .bind = imx8mp_dw_hdmi_bind,
> > + .unbind = imx8mp_dw_hdmi_unbind,
> > +};
> > +
> > static int imx8mp_dw_hdmi_probe(struct platform_device *pdev)
> > {
> > struct device *dev = &pdev->dev;
> > struct dw_hdmi_plat_data *plat_data;
> > + struct component_match *match;
>
> As Alexander pointed out, this needs to be set to NULL.
> See how other drivers which are component masters do.
>
> > + struct device_node *remote;
> > struct imx8mp_hdmi *hdmi;
> > + int ret;
> >
> > hdmi = devm_kzalloc(dev, sizeof(*hdmi), GFP_KERNEL);
> > if (!hdmi)
> > @@ -108,6 +145,22 @@ static int imx8mp_dw_hdmi_probe(struct platform_device *pdev)
> >
> > platform_set_drvdata(pdev, hdmi);
> >
> > + /* port@2 is for hdmi_pai device */
> > + remote = of_graph_get_remote_node(pdev->dev.of_node, 2, 0);
> > + if (remote && of_device_is_available(remote)) {
>
> Doesn't of_graph_get_remote_node() ensure that remote is avaiable?
No. 'remote' is the node, not the 'device'.
>
> > + drm_of_component_match_add(dev, &match, component_compare_of, remote);
> > +
> > + of_node_put(remote);
> > +
> > + ret = component_master_add_with_match(dev, &imx8mp_dw_hdmi_ops, match);
> > + if (ret)
> > + dev_warn(dev, "Unable to register aggregate driver\n");
> > + /*
> > + * This audio function is optional for avoid blocking display.
> > + * So just print warning message and no error is returned.
>
> No, since PAI node is available here, it has to be bound. Yet you still need
> to properly handle the case where PAI node is inavailable.
This is for aggregate driver registration, not for bind()
The bind() is called after both drivers have been registered. again there is no
dependency for both aggregate driver and component driver should be
registered or probed.
best regards
shengjiu wang
>
> > + */
> > + }
> > +
> > return 0;
> > }
> >
> > @@ -115,6 +168,8 @@ static void imx8mp_dw_hdmi_remove(struct platform_device *pdev)
> > {
> > struct imx8mp_hdmi *hdmi = platform_get_drvdata(pdev);
> >
> > + component_master_del(&pdev->dev, &imx8mp_dw_hdmi_ops);
> > +
> > dw_hdmi_remove(hdmi->dw_hdmi);
> > }
> >
> > diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h
> > index 095cdd9b7424..336f062e1f9d 100644
> > --- a/include/drm/bridge/dw_hdmi.h
> > +++ b/include/drm/bridge/dw_hdmi.h
> > @@ -143,6 +143,12 @@ struct dw_hdmi_plat_data {
> > const struct drm_display_info *info,
> > const struct drm_display_mode *mode);
> >
> > + /*
> > + * priv_audio is specially used for additional audio device to get
> > + * driver data through this dw_hdmi_plat_data.
> > + */
> > + void *priv_audio;
> > +
> > /* Platform-specific audio enable/disable (optional) */
> > void (*enable_audio)(struct dw_hdmi *hdmi, int channel,
> > int width, int rate, int non_pcm, int iec958);
>
>
> --
> Regards,
> Liu Ying
On 08/06/2025, Shengjiu Wang wrote:
> On Tue, Aug 5, 2025 at 4:55 PM Liu Ying <victor.liu@nxp.com> wrote:
>>
>> On 08/04/2025, Shengjiu Wang wrote:
[...]
>>> +static int imx8mp_hdmi_pai_bind(struct device *dev, struct device *master, void *data)
>>> +{
>>> + struct dw_hdmi_plat_data *plat_data = (struct dw_hdmi_plat_data *)data;
>>> + struct imx8mp_hdmi_pai *hdmi_pai;
>>> +
>>> + hdmi_pai = dev_get_drvdata(dev);
>>> +
>>> + plat_data->enable_audio = imx8mp_hdmi_pai_enable;
>>> + plat_data->disable_audio = imx8mp_hdmi_pai_disable;
>>> + plat_data->priv_audio = hdmi_pai;
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +static void imx8mp_hdmi_pai_unbind(struct device *dev, struct device *master, void *data)
>>> +{
>>> + struct dw_hdmi_plat_data *plat_data = (struct dw_hdmi_plat_data *)data;
>>> +
>>> + plat_data->enable_audio = NULL;
>>> + plat_data->disable_audio = NULL;
>>> + plat_data->priv_audio = NULL;
>>
>> Do you really need to set these ptrs to NULL?
>
> yes. below code in dw-hdmi.c use the pdata->enable_audio as condition.
Note that this is all about tearing down components.
If this is done properly as the below snippet of pseudo-code, then
hdmi->{enable,disable}_audio() and pdata->{enable,disable}_audio() won't be
called after audio device is removed by dw_hdmi_remove(). So, it's unnecessary
to set these pointers to NULL here.
imx8mp_dw_hdmi_unbind()
{
dw_hdmi_remove(); // platform_device_unregister(hdmi->audio);
component_unbind_all(); //imx8mp_hdmi_pai_unbind()
}
BTW, I suggest the below snippet[1] to bind components.
imx8mp_dw_hdmi_bind()
{
component_bind_all(); // imx8mp_hdmi_pai_bind()
// set pdata->{enable,disable}_audio
dw_hdmi_probe(); // hdmi->audio = platform_device_register_full(&pdevinfo);
}
>
> if (pdata->enable_audio)
> pdata->enable_audio(hdmi,
> hdmi->channels,
> hdmi->sample_width,
> hdmi->sample_rate,
> hdmi->sample_non_pcm,
> hdmi->sample_iec958);
>
>
>>
[...]
>>> + return component_add(dev, &imx8mp_hdmi_pai_ops);
>>
>> Imagine that users could enable this driver without enabling imx8mp-hdmi-tx
>> driver, you may add the component in this probe() callback only and move all
>> the other stuff to bind() callback to avoid unnecessary things being done here.
>
> component helper functions don't have such dependency that the aggregate
> driver or component driver must be probed or not. if imx8mp-hdmi-tx is not
> enabled, there is no problem, just the bind() callback is not called.
I meant I'd write imx8mp_hdmi_pai_probe() as below snippet and do all the
other stuff in imx8mp_hdmi_pai_bind(). This ensures minimum things are done
in imx8mp_hdmi_pai_probe() if imx8mp-hdmi-tx doesn't probe.
static int imx8mp_hdmi_pai_probe(struct platform_device *pdev)
{
return component_add(&pdev->dev, &imx8mp_hdmi_pai_ops);
}
>
>>
>>> +}
>>> +
>>> +static void imx8mp_hdmi_pai_remove(struct platform_device *pdev)
>>> +{
>>> + component_del(&pdev->dev, &imx8mp_hdmi_pai_ops);
>>> +}
>>> +
>>> +static const struct of_device_id imx8mp_hdmi_pai_of_table[] = {
>>> + { .compatible = "fsl,imx8mp-hdmi-pai" },
>>> + { /* Sentinel */ }
>>> +};
>>> +MODULE_DEVICE_TABLE(of, imx8mp_hdmi_pai_of_table);
>>> +
>>> +static struct platform_driver imx8mp_hdmi_pai_platform_driver = {
>>> + .probe = imx8mp_hdmi_pai_probe,
>>> + .remove = imx8mp_hdmi_pai_remove,
>>> + .driver = {
>>> + .name = "imx8mp-hdmi-pai",
>>> + .of_match_table = imx8mp_hdmi_pai_of_table,
>>> + },
>>> +};
>>> +module_platform_driver(imx8mp_hdmi_pai_platform_driver);
>>> +
>>> +MODULE_DESCRIPTION("i.MX8MP HDMI PAI driver");
>>> +MODULE_LICENSE("GPL");
>>> diff --git a/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c
>>> index 1e7a789ec289..ee08084d2394 100644
>>> --- a/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c
>>> +++ b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c
>>> @@ -5,11 +5,13 @@
>>> */
>>>
>>> #include <linux/clk.h>
>>> +#include <linux/component.h>
>>> #include <linux/mod_devicetable.h>
>>> #include <linux/module.h>
>>> #include <linux/platform_device.h>
>>> #include <drm/bridge/dw_hdmi.h>
>>> #include <drm/drm_modes.h>
>>> +#include <drm/drm_of.h>
>>>
>>> struct imx8mp_hdmi {
>>> struct dw_hdmi_plat_data plat_data;
>>> @@ -79,11 +81,46 @@ static const struct dw_hdmi_phy_ops imx8mp_hdmi_phy_ops = {
>>> .update_hpd = dw_hdmi_phy_update_hpd,
>>> };
>>>
>>> +static int imx8mp_dw_hdmi_bind(struct device *dev)
>>> +{
>>> + struct dw_hdmi_plat_data *plat_data;
>>> + struct imx8mp_hdmi *hdmi;
>>> + int ret;
>>> +
>>> + hdmi = dev_get_drvdata(dev);
>>> + plat_data = &hdmi->plat_data;
>>> +
>>> + ret = component_bind_all(dev, plat_data);
>>> + if (ret)
>>> + return dev_err_probe(dev, ret, "component_bind_all failed!\n");
>>
>> As component_bind_all() would bind imx8mp-hdmi-pai and hence set
>> {enable,disable}_audio callbacks, you need to call dw_hdmi_probe() after
>> component_bind_all() instead of too early in probe() callback.
>
> There is no such dependency.
> Maybe you mixed the hdmi->enable_audio() with pdata->enable_audio().
As the above snippet[1] shows, once dw_hdmi_probe() registers audio device,
the audio device could be functional soon after audio driver probes, hence
hdmi->enable_audio() would be called and hence pdata->enable_audio() would
be called. So, you need to set pdata->enable_audio() before dw_hdmi_probe()
is called, otherwise pdata->enable_audio could be NULL when is called by
audio driver.
[...]
>>> + remote = of_graph_get_remote_node(pdev->dev.of_node, 2, 0);
>>> + if (remote && of_device_is_available(remote)) {
>>
>> Doesn't of_graph_get_remote_node() ensure that remote is avaiable?
>
> No. 'remote' is the node, not the 'device'.
See of_device_is_available() is called by of_graph_get_remote_node():
struct device_node *of_graph_get_remote_node(const struct device_node *node,
u32 port, u32 endpoint)
{
struct device_node *endpoint_node, *remote;
endpoint_node = of_graph_get_endpoint_by_regs(node, port, endpoint);
if (!endpoint_node) {
pr_debug("no valid endpoint (%d, %d) for node %pOF\n",
port, endpoint, node);
return NULL;
}
remote = of_graph_get_remote_port_parent(endpoint_node);
of_node_put(endpoint_node);
if (!remote) {
pr_debug("no valid remote node\n");
return NULL;
}
if (!of_device_is_available(remote)) {
^~~~~~~~~~~~~~~~~~~~~~
pr_debug("not available for remote node\n");
of_node_put(remote);
return NULL;
}
return remote;
}
EXPORT_SYMBOL(of_graph_get_remote_node);
>
>>
>>> + drm_of_component_match_add(dev, &match, component_compare_of, remote);
>>> +
>>> + of_node_put(remote);
>>> +
>>> + ret = component_master_add_with_match(dev, &imx8mp_dw_hdmi_ops, match);
>>> + if (ret)
>>> + dev_warn(dev, "Unable to register aggregate driver\n");
>>> + /*
>>> + * This audio function is optional for avoid blocking display.
>>> + * So just print warning message and no error is returned.
>>
>> No, since PAI node is available here, it has to be bound. Yet you still need
>> to properly handle the case where PAI node is inavailable.
>
> This is for aggregate driver registration, not for bind()
>
> The bind() is called after both drivers have been registered. again there is no
> dependency for both aggregate driver and component driver should be
> registered or probed.
Sorry for not being clear about my previous wording. I meant since PAI node is
available here, component_master_add_with_match() must be called to register
the master and if it fails to register it, imx8mp_dw_hdmi_probe() should return
proper error code, not 0.
--
Regards,
Liu Ying
On Wed, Aug 6, 2025 at 2:52 PM Liu Ying <victor.liu@nxp.com> wrote:
>
> On 08/06/2025, Shengjiu Wang wrote:
> > On Tue, Aug 5, 2025 at 4:55 PM Liu Ying <victor.liu@nxp.com> wrote:
> >>
> >> On 08/04/2025, Shengjiu Wang wrote:
>
> [...]
>
> >>> +static int imx8mp_hdmi_pai_bind(struct device *dev, struct device *master, void *data)
> >>> +{
> >>> + struct dw_hdmi_plat_data *plat_data = (struct dw_hdmi_plat_data *)data;
> >>> + struct imx8mp_hdmi_pai *hdmi_pai;
> >>> +
> >>> + hdmi_pai = dev_get_drvdata(dev);
> >>> +
> >>> + plat_data->enable_audio = imx8mp_hdmi_pai_enable;
> >>> + plat_data->disable_audio = imx8mp_hdmi_pai_disable;
> >>> + plat_data->priv_audio = hdmi_pai;
> >>> +
> >>> + return 0;
> >>> +}
> >>> +
> >>> +static void imx8mp_hdmi_pai_unbind(struct device *dev, struct device *master, void *data)
> >>> +{
> >>> + struct dw_hdmi_plat_data *plat_data = (struct dw_hdmi_plat_data *)data;
> >>> +
> >>> + plat_data->enable_audio = NULL;
> >>> + plat_data->disable_audio = NULL;
> >>> + plat_data->priv_audio = NULL;
> >>
> >> Do you really need to set these ptrs to NULL?
> >
> > yes. below code in dw-hdmi.c use the pdata->enable_audio as condition.
>
> Note that this is all about tearing down components.
> If this is done properly as the below snippet of pseudo-code, then
> hdmi->{enable,disable}_audio() and pdata->{enable,disable}_audio() won't be
> called after audio device is removed by dw_hdmi_remove(). So, it's unnecessary
> to set these pointers to NULL here.
>
> imx8mp_dw_hdmi_unbind()
> {
> dw_hdmi_remove(); // platform_device_unregister(hdmi->audio);
> component_unbind_all(); //imx8mp_hdmi_pai_unbind()
> }
>
> BTW, I suggest the below snippet[1] to bind components.
>
> imx8mp_dw_hdmi_bind()
> {
> component_bind_all(); // imx8mp_hdmi_pai_bind()
> // set pdata->{enable,disable}_audio
> dw_hdmi_probe(); // hdmi->audio = platform_device_register_full(&pdevinfo);
> }
Looks like we should use dw_hdmi_bind() here to make unbind -> bind work.
But can't get the encoder pointer. the encoder pointer is from lcdif_drv.c,
the probe sequence of lcdif, pvi, dw_hdmi should be dw_hdmi first, then pvi,
then lcdif, because current implementation in lcdif and pvi driver.
Should the lcdif and pvi driver be modified to use component helper?
This seems out of the scope of this patch set.
Best regards
Shengjiu Wang
>
> >
> > if (pdata->enable_audio)
> > pdata->enable_audio(hdmi,
> > hdmi->channels,
> > hdmi->sample_width,
> > hdmi->sample_rate,
> > hdmi->sample_non_pcm,
> > hdmi->sample_iec958);
> >
> >
> >>
>
> [...]
>
> >>> + return component_add(dev, &imx8mp_hdmi_pai_ops);
> >>
> >> Imagine that users could enable this driver without enabling imx8mp-hdmi-tx
> >> driver, you may add the component in this probe() callback only and move all
> >> the other stuff to bind() callback to avoid unnecessary things being done here.
> >
> > component helper functions don't have such dependency that the aggregate
> > driver or component driver must be probed or not. if imx8mp-hdmi-tx is not
> > enabled, there is no problem, just the bind() callback is not called.
>
> I meant I'd write imx8mp_hdmi_pai_probe() as below snippet and do all the
> other stuff in imx8mp_hdmi_pai_bind(). This ensures minimum things are done
> in imx8mp_hdmi_pai_probe() if imx8mp-hdmi-tx doesn't probe.
>
> static int imx8mp_hdmi_pai_probe(struct platform_device *pdev)
> {
> return component_add(&pdev->dev, &imx8mp_hdmi_pai_ops);
> }
>
> >
> >>
> >>> +}
> >>> +
> >>> +static void imx8mp_hdmi_pai_remove(struct platform_device *pdev)
> >>> +{
> >>> + component_del(&pdev->dev, &imx8mp_hdmi_pai_ops);
> >>> +}
> >>> +
> >>> +static const struct of_device_id imx8mp_hdmi_pai_of_table[] = {
> >>> + { .compatible = "fsl,imx8mp-hdmi-pai" },
> >>> + { /* Sentinel */ }
> >>> +};
> >>> +MODULE_DEVICE_TABLE(of, imx8mp_hdmi_pai_of_table);
> >>> +
> >>> +static struct platform_driver imx8mp_hdmi_pai_platform_driver = {
> >>> + .probe = imx8mp_hdmi_pai_probe,
> >>> + .remove = imx8mp_hdmi_pai_remove,
> >>> + .driver = {
> >>> + .name = "imx8mp-hdmi-pai",
> >>> + .of_match_table = imx8mp_hdmi_pai_of_table,
> >>> + },
> >>> +};
> >>> +module_platform_driver(imx8mp_hdmi_pai_platform_driver);
> >>> +
> >>> +MODULE_DESCRIPTION("i.MX8MP HDMI PAI driver");
> >>> +MODULE_LICENSE("GPL");
> >>> diff --git a/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c
> >>> index 1e7a789ec289..ee08084d2394 100644
> >>> --- a/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c
> >>> +++ b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c
> >>> @@ -5,11 +5,13 @@
> >>> */
> >>>
> >>> #include <linux/clk.h>
> >>> +#include <linux/component.h>
> >>> #include <linux/mod_devicetable.h>
> >>> #include <linux/module.h>
> >>> #include <linux/platform_device.h>
> >>> #include <drm/bridge/dw_hdmi.h>
> >>> #include <drm/drm_modes.h>
> >>> +#include <drm/drm_of.h>
> >>>
> >>> struct imx8mp_hdmi {
> >>> struct dw_hdmi_plat_data plat_data;
> >>> @@ -79,11 +81,46 @@ static const struct dw_hdmi_phy_ops imx8mp_hdmi_phy_ops = {
> >>> .update_hpd = dw_hdmi_phy_update_hpd,
> >>> };
> >>>
> >>> +static int imx8mp_dw_hdmi_bind(struct device *dev)
> >>> +{
> >>> + struct dw_hdmi_plat_data *plat_data;
> >>> + struct imx8mp_hdmi *hdmi;
> >>> + int ret;
> >>> +
> >>> + hdmi = dev_get_drvdata(dev);
> >>> + plat_data = &hdmi->plat_data;
> >>> +
> >>> + ret = component_bind_all(dev, plat_data);
> >>> + if (ret)
> >>> + return dev_err_probe(dev, ret, "component_bind_all failed!\n");
> >>
> >> As component_bind_all() would bind imx8mp-hdmi-pai and hence set
> >> {enable,disable}_audio callbacks, you need to call dw_hdmi_probe() after
> >> component_bind_all() instead of too early in probe() callback.
> >
> > There is no such dependency.
> > Maybe you mixed the hdmi->enable_audio() with pdata->enable_audio().
>
> As the above snippet[1] shows, once dw_hdmi_probe() registers audio device,
> the audio device could be functional soon after audio driver probes, hence
> hdmi->enable_audio() would be called and hence pdata->enable_audio() would
> be called. So, you need to set pdata->enable_audio() before dw_hdmi_probe()
> is called, otherwise pdata->enable_audio could be NULL when is called by
> audio driver.
>
> [...]
>
> >>> + remote = of_graph_get_remote_node(pdev->dev.of_node, 2, 0);
> >>> + if (remote && of_device_is_available(remote)) {
> >>
> >> Doesn't of_graph_get_remote_node() ensure that remote is avaiable?
> >
> > No. 'remote' is the node, not the 'device'.
>
> See of_device_is_available() is called by of_graph_get_remote_node():
>
> struct device_node *of_graph_get_remote_node(const struct device_node *node,
> u32 port, u32 endpoint)
> {
> struct device_node *endpoint_node, *remote;
>
> endpoint_node = of_graph_get_endpoint_by_regs(node, port, endpoint);
> if (!endpoint_node) {
> pr_debug("no valid endpoint (%d, %d) for node %pOF\n",
> port, endpoint, node);
> return NULL;
> }
>
> remote = of_graph_get_remote_port_parent(endpoint_node);
> of_node_put(endpoint_node);
> if (!remote) {
> pr_debug("no valid remote node\n");
> return NULL;
> }
>
> if (!of_device_is_available(remote)) {
> ^~~~~~~~~~~~~~~~~~~~~~
> pr_debug("not available for remote node\n");
> of_node_put(remote);
> return NULL;
> }
>
> return remote;
> }
> EXPORT_SYMBOL(of_graph_get_remote_node);
>
> >
> >>
> >>> + drm_of_component_match_add(dev, &match, component_compare_of, remote);
> >>> +
> >>> + of_node_put(remote);
> >>> +
> >>> + ret = component_master_add_with_match(dev, &imx8mp_dw_hdmi_ops, match);
> >>> + if (ret)
> >>> + dev_warn(dev, "Unable to register aggregate driver\n");
> >>> + /*
> >>> + * This audio function is optional for avoid blocking display.
> >>> + * So just print warning message and no error is returned.
> >>
> >> No, since PAI node is available here, it has to be bound. Yet you still need
> >> to properly handle the case where PAI node is inavailable.
> >
> > This is for aggregate driver registration, not for bind()
> >
> > The bind() is called after both drivers have been registered. again there is no
> > dependency for both aggregate driver and component driver should be
> > registered or probed.
>
> Sorry for not being clear about my previous wording. I meant since PAI node is
> available here, component_master_add_with_match() must be called to register
> the master and if it fails to register it, imx8mp_dw_hdmi_probe() should return
> proper error code, not 0.
>
> --
> Regards,
> Liu Ying
On 08/07/2025, Shengjiu Wang wrote:
> On Wed, Aug 6, 2025 at 2:52 PM Liu Ying <victor.liu@nxp.com> wrote:
>>
>> On 08/06/2025, Shengjiu Wang wrote:
>>> On Tue, Aug 5, 2025 at 4:55 PM Liu Ying <victor.liu@nxp.com> wrote:
>>>>
>>>> On 08/04/2025, Shengjiu Wang wrote:
>>
>> [...]
>>
>>>>> +static int imx8mp_hdmi_pai_bind(struct device *dev, struct device *master, void *data)
>>>>> +{
>>>>> + struct dw_hdmi_plat_data *plat_data = (struct dw_hdmi_plat_data *)data;
>>>>> + struct imx8mp_hdmi_pai *hdmi_pai;
>>>>> +
>>>>> + hdmi_pai = dev_get_drvdata(dev);
>>>>> +
>>>>> + plat_data->enable_audio = imx8mp_hdmi_pai_enable;
>>>>> + plat_data->disable_audio = imx8mp_hdmi_pai_disable;
>>>>> + plat_data->priv_audio = hdmi_pai;
>>>>> +
>>>>> + return 0;
>>>>> +}
>>>>> +
>>>>> +static void imx8mp_hdmi_pai_unbind(struct device *dev, struct device *master, void *data)
>>>>> +{
>>>>> + struct dw_hdmi_plat_data *plat_data = (struct dw_hdmi_plat_data *)data;
>>>>> +
>>>>> + plat_data->enable_audio = NULL;
>>>>> + plat_data->disable_audio = NULL;
>>>>> + plat_data->priv_audio = NULL;
>>>>
>>>> Do you really need to set these ptrs to NULL?
>>>
>>> yes. below code in dw-hdmi.c use the pdata->enable_audio as condition.
>>
>> Note that this is all about tearing down components.
>> If this is done properly as the below snippet of pseudo-code, then
>> hdmi->{enable,disable}_audio() and pdata->{enable,disable}_audio() won't be
>> called after audio device is removed by dw_hdmi_remove(). So, it's unnecessary
>> to set these pointers to NULL here.
>>
>> imx8mp_dw_hdmi_unbind()
>> {
>> dw_hdmi_remove(); // platform_device_unregister(hdmi->audio);
>> component_unbind_all(); //imx8mp_hdmi_pai_unbind()
>> }
>>
>> BTW, I suggest the below snippet[1] to bind components.
>>
>> imx8mp_dw_hdmi_bind()
>> {
>> component_bind_all(); // imx8mp_hdmi_pai_bind()
>> // set pdata->{enable,disable}_audio
>> dw_hdmi_probe(); // hdmi->audio = platform_device_register_full(&pdevinfo);
>> }
>
> Looks like we should use dw_hdmi_bind() here to make unbind -> bind work.
I don't get your idea here.
What are you trying to make work?
Why dw_hdmi_probe() can't be used?
How does dw_hdmi_bind() help here?
> But can't get the encoder pointer. the encoder pointer is from lcdif_drv.c,
> the probe sequence of lcdif, pvi, dw_hdmi should be dw_hdmi first, then pvi,
> then lcdif, because current implementation in lcdif and pvi driver.
We use deferral probe to make sure the probe sequence is
DW_HDMI -> PVI -> LCDIF.
LCDIF driver would call devm_drm_of_get_bridge() to get the next bridge PVI
and it defers probe if devm_drm_of_get_bridge() returns ERR_PTR(-EPROBE_DEFER).
Same to PVI driver, it would call of_drm_find_bridge() to get the next bridge
DW_HDMI and defers probe if needed.
>
> Should the lcdif and pvi driver be modified to use component helper?
Why should they use component helper?
BTW, I've tried testing the snippets suggested by me on i.MX8MP EVK and
the components bind successfully:
cat /sys/kernel/debug/device_component/32fd8000.hdmi
aggregate_device name status
-----------------------------------------------------------------------
32fd8000.hdmi bound
device name status
-----------------------------------------------------------------------
32fc4800.audio-bridge bound
> This seems out of the scope of this patch set.
>
> Best regards
> Shengjiu Wang
[...]
--
Regards,
Liu Ying
On Fri, Aug 8, 2025 at 2:32 PM Liu Ying <victor.liu@nxp.com> wrote:
>
> On 08/07/2025, Shengjiu Wang wrote:
> > On Wed, Aug 6, 2025 at 2:52 PM Liu Ying <victor.liu@nxp.com> wrote:
> >>
> >> On 08/06/2025, Shengjiu Wang wrote:
> >>> On Tue, Aug 5, 2025 at 4:55 PM Liu Ying <victor.liu@nxp.com> wrote:
> >>>>
> >>>> On 08/04/2025, Shengjiu Wang wrote:
> >>
> >> [...]
> >>
> >>>>> +static int imx8mp_hdmi_pai_bind(struct device *dev, struct device *master, void *data)
> >>>>> +{
> >>>>> + struct dw_hdmi_plat_data *plat_data = (struct dw_hdmi_plat_data *)data;
> >>>>> + struct imx8mp_hdmi_pai *hdmi_pai;
> >>>>> +
> >>>>> + hdmi_pai = dev_get_drvdata(dev);
> >>>>> +
> >>>>> + plat_data->enable_audio = imx8mp_hdmi_pai_enable;
> >>>>> + plat_data->disable_audio = imx8mp_hdmi_pai_disable;
> >>>>> + plat_data->priv_audio = hdmi_pai;
> >>>>> +
> >>>>> + return 0;
> >>>>> +}
> >>>>> +
> >>>>> +static void imx8mp_hdmi_pai_unbind(struct device *dev, struct device *master, void *data)
> >>>>> +{
> >>>>> + struct dw_hdmi_plat_data *plat_data = (struct dw_hdmi_plat_data *)data;
> >>>>> +
> >>>>> + plat_data->enable_audio = NULL;
> >>>>> + plat_data->disable_audio = NULL;
> >>>>> + plat_data->priv_audio = NULL;
> >>>>
> >>>> Do you really need to set these ptrs to NULL?
> >>>
> >>> yes. below code in dw-hdmi.c use the pdata->enable_audio as condition.
> >>
> >> Note that this is all about tearing down components.
> >> If this is done properly as the below snippet of pseudo-code, then
> >> hdmi->{enable,disable}_audio() and pdata->{enable,disable}_audio() won't be
> >> called after audio device is removed by dw_hdmi_remove(). So, it's unnecessary
> >> to set these pointers to NULL here.
> >>
> >> imx8mp_dw_hdmi_unbind()
> >> {
> >> dw_hdmi_remove(); // platform_device_unregister(hdmi->audio);
> >> component_unbind_all(); //imx8mp_hdmi_pai_unbind()
> >> }
> >>
> >> BTW, I suggest the below snippet[1] to bind components.
> >>
> >> imx8mp_dw_hdmi_bind()
> >> {
> >> component_bind_all(); // imx8mp_hdmi_pai_bind()
> >> // set pdata->{enable,disable}_audio
> >> dw_hdmi_probe(); // hdmi->audio = platform_device_register_full(&pdevinfo);
> >> }
> >
> > Looks like we should use dw_hdmi_bind() here to make unbind -> bind work.
>
> I don't get your idea here.
>
> What are you trying to make work?
> Why dw_hdmi_probe() can't be used?
> How does dw_hdmi_bind() help here?
bind() is ok. but unbind(), then bind() there is an issue.
>
> > But can't get the encoder pointer. the encoder pointer is from lcdif_drv.c,
> > the probe sequence of lcdif, pvi, dw_hdmi should be dw_hdmi first, then pvi,
> > then lcdif, because current implementation in lcdif and pvi driver.
>
> We use deferral probe to make sure the probe sequence is
> DW_HDMI -> PVI -> LCDIF.
>
> LCDIF driver would call devm_drm_of_get_bridge() to get the next bridge PVI
> and it defers probe if devm_drm_of_get_bridge() returns ERR_PTR(-EPROBE_DEFER).
> Same to PVI driver, it would call of_drm_find_bridge() to get the next bridge
> DW_HDMI and defers probe if needed.
right, probe is no problem, but after probe, if unbind pai, hdmi_tx,
then bind
them again, there is a problem, because no one call the
drm_bridge_attach() again.
>
> >
> > Should the lcdif and pvi driver be modified to use component helper?
>
> Why should they use component helper?
>
> BTW, I've tried testing the snippets suggested by me on i.MX8MP EVK and
> the components bind successfully:
right, probe is no problem. but if try to unbind() then bind, there is issue.
best regards
shengjiu Wang
>
> cat /sys/kernel/debug/device_component/32fd8000.hdmi
> aggregate_device name status
> -----------------------------------------------------------------------
> 32fd8000.hdmi bound
>
> device name status
> -----------------------------------------------------------------------
> 32fc4800.audio-bridge bound
>
> > This seems out of the scope of this patch set.
> >
> > Best regards
> > Shengjiu Wang
>
> [...]
>
> --
> Regards,
> Liu Ying
On 08/08/2025, Shengjiu Wang wrote:
> On Fri, Aug 8, 2025 at 2:32 PM Liu Ying <victor.liu@nxp.com> wrote:
>>
>> On 08/07/2025, Shengjiu Wang wrote:
>>> On Wed, Aug 6, 2025 at 2:52 PM Liu Ying <victor.liu@nxp.com> wrote:
>>>>
>>>> On 08/06/2025, Shengjiu Wang wrote:
>>>>> On Tue, Aug 5, 2025 at 4:55 PM Liu Ying <victor.liu@nxp.com> wrote:
>>>>>>
>>>>>> On 08/04/2025, Shengjiu Wang wrote:
>>>>
>>>> [...]
>>>>
>>>>>>> +static int imx8mp_hdmi_pai_bind(struct device *dev, struct device *master, void *data)
>>>>>>> +{
>>>>>>> + struct dw_hdmi_plat_data *plat_data = (struct dw_hdmi_plat_data *)data;
>>>>>>> + struct imx8mp_hdmi_pai *hdmi_pai;
>>>>>>> +
>>>>>>> + hdmi_pai = dev_get_drvdata(dev);
>>>>>>> +
>>>>>>> + plat_data->enable_audio = imx8mp_hdmi_pai_enable;
>>>>>>> + plat_data->disable_audio = imx8mp_hdmi_pai_disable;
>>>>>>> + plat_data->priv_audio = hdmi_pai;
>>>>>>> +
>>>>>>> + return 0;
>>>>>>> +}
>>>>>>> +
>>>>>>> +static void imx8mp_hdmi_pai_unbind(struct device *dev, struct device *master, void *data)
>>>>>>> +{
>>>>>>> + struct dw_hdmi_plat_data *plat_data = (struct dw_hdmi_plat_data *)data;
>>>>>>> +
>>>>>>> + plat_data->enable_audio = NULL;
>>>>>>> + plat_data->disable_audio = NULL;
>>>>>>> + plat_data->priv_audio = NULL;
>>>>>>
>>>>>> Do you really need to set these ptrs to NULL?
>>>>>
>>>>> yes. below code in dw-hdmi.c use the pdata->enable_audio as condition.
>>>>
>>>> Note that this is all about tearing down components.
>>>> If this is done properly as the below snippet of pseudo-code, then
>>>> hdmi->{enable,disable}_audio() and pdata->{enable,disable}_audio() won't be
>>>> called after audio device is removed by dw_hdmi_remove(). So, it's unnecessary
>>>> to set these pointers to NULL here.
>>>>
>>>> imx8mp_dw_hdmi_unbind()
>>>> {
>>>> dw_hdmi_remove(); // platform_device_unregister(hdmi->audio);
>>>> component_unbind_all(); //imx8mp_hdmi_pai_unbind()
>>>> }
>>>>
>>>> BTW, I suggest the below snippet[1] to bind components.
>>>>
>>>> imx8mp_dw_hdmi_bind()
>>>> {
>>>> component_bind_all(); // imx8mp_hdmi_pai_bind()
>>>> // set pdata->{enable,disable}_audio
>>>> dw_hdmi_probe(); // hdmi->audio = platform_device_register_full(&pdevinfo);
>>>> }
>>>
>>> Looks like we should use dw_hdmi_bind() here to make unbind -> bind work.
>>
>> I don't get your idea here.
>>
>> What are you trying to make work?
>> Why dw_hdmi_probe() can't be used?
>> How does dw_hdmi_bind() help here?
>
> bind() is ok. but unbind(), then bind() there is an issue.
>
>>
>>> But can't get the encoder pointer. the encoder pointer is from lcdif_drv.c,
>>> the probe sequence of lcdif, pvi, dw_hdmi should be dw_hdmi first, then pvi,
>>> then lcdif, because current implementation in lcdif and pvi driver.
>>
>> We use deferral probe to make sure the probe sequence is
>> DW_HDMI -> PVI -> LCDIF.
>>
>> LCDIF driver would call devm_drm_of_get_bridge() to get the next bridge PVI
>> and it defers probe if devm_drm_of_get_bridge() returns ERR_PTR(-EPROBE_DEFER).
>> Same to PVI driver, it would call of_drm_find_bridge() to get the next bridge
>> DW_HDMI and defers probe if needed.
>
> right, probe is no problem, but after probe, if unbind pai, hdmi_tx,
> then bind
> them again, there is a problem, because no one call the
> drm_bridge_attach() again.
In my mind, this is a common issue as DRM bridges are not properly detached
and attached again.
For now, only drm_encoder_cleanup() calls drm_bridge_detach().
Anyway, this issue is not introduced by this patch series, i.e. it's already
there.
>
>>
>>>
>>> Should the lcdif and pvi driver be modified to use component helper?
>>
>> Why should they use component helper?
>>
>> BTW, I've tried testing the snippets suggested by me on i.MX8MP EVK and
>> the components bind successfully:
>
> right, probe is no problem. but if try to unbind() then bind, there is issue.
I don't think the DRM bridge detach/attach issue would be addressed by
using component helper.
>
> best regards
> shengjiu Wang
>>
>> cat /sys/kernel/debug/device_component/32fd8000.hdmi
>> aggregate_device name status
>> -----------------------------------------------------------------------
>> 32fd8000.hdmi bound
>>
>> device name status
>> -----------------------------------------------------------------------
>> 32fc4800.audio-bridge bound
>>
>>> This seems out of the scope of this patch set.
>>>
>>> Best regards
>>> Shengjiu Wang
>>
>> [...]
>>
>> --
>> Regards,
>> Liu Ying
--
Regards,
Liu Ying
On Fri, Aug 8, 2025 at 3:49 PM Liu Ying <victor.liu@nxp.com> wrote:
>
> On 08/08/2025, Shengjiu Wang wrote:
> > On Fri, Aug 8, 2025 at 2:32 PM Liu Ying <victor.liu@nxp.com> wrote:
> >>
> >> On 08/07/2025, Shengjiu Wang wrote:
> >>> On Wed, Aug 6, 2025 at 2:52 PM Liu Ying <victor.liu@nxp.com> wrote:
> >>>>
> >>>> On 08/06/2025, Shengjiu Wang wrote:
> >>>>> On Tue, Aug 5, 2025 at 4:55 PM Liu Ying <victor.liu@nxp.com> wrote:
> >>>>>>
> >>>>>> On 08/04/2025, Shengjiu Wang wrote:
> >>>>
> >>>> [...]
> >>>>
> >>>>>>> +static int imx8mp_hdmi_pai_bind(struct device *dev, struct device *master, void *data)
> >>>>>>> +{
> >>>>>>> + struct dw_hdmi_plat_data *plat_data = (struct dw_hdmi_plat_data *)data;
> >>>>>>> + struct imx8mp_hdmi_pai *hdmi_pai;
> >>>>>>> +
> >>>>>>> + hdmi_pai = dev_get_drvdata(dev);
> >>>>>>> +
> >>>>>>> + plat_data->enable_audio = imx8mp_hdmi_pai_enable;
> >>>>>>> + plat_data->disable_audio = imx8mp_hdmi_pai_disable;
> >>>>>>> + plat_data->priv_audio = hdmi_pai;
> >>>>>>> +
> >>>>>>> + return 0;
> >>>>>>> +}
> >>>>>>> +
> >>>>>>> +static void imx8mp_hdmi_pai_unbind(struct device *dev, struct device *master, void *data)
> >>>>>>> +{
> >>>>>>> + struct dw_hdmi_plat_data *plat_data = (struct dw_hdmi_plat_data *)data;
> >>>>>>> +
> >>>>>>> + plat_data->enable_audio = NULL;
> >>>>>>> + plat_data->disable_audio = NULL;
> >>>>>>> + plat_data->priv_audio = NULL;
> >>>>>>
> >>>>>> Do you really need to set these ptrs to NULL?
> >>>>>
> >>>>> yes. below code in dw-hdmi.c use the pdata->enable_audio as condition.
> >>>>
> >>>> Note that this is all about tearing down components.
> >>>> If this is done properly as the below snippet of pseudo-code, then
> >>>> hdmi->{enable,disable}_audio() and pdata->{enable,disable}_audio() won't be
> >>>> called after audio device is removed by dw_hdmi_remove(). So, it's unnecessary
> >>>> to set these pointers to NULL here.
> >>>>
> >>>> imx8mp_dw_hdmi_unbind()
> >>>> {
> >>>> dw_hdmi_remove(); // platform_device_unregister(hdmi->audio);
> >>>> component_unbind_all(); //imx8mp_hdmi_pai_unbind()
> >>>> }
> >>>>
> >>>> BTW, I suggest the below snippet[1] to bind components.
> >>>>
> >>>> imx8mp_dw_hdmi_bind()
> >>>> {
> >>>> component_bind_all(); // imx8mp_hdmi_pai_bind()
> >>>> // set pdata->{enable,disable}_audio
> >>>> dw_hdmi_probe(); // hdmi->audio = platform_device_register_full(&pdevinfo);
> >>>> }
> >>>
> >>> Looks like we should use dw_hdmi_bind() here to make unbind -> bind work.
> >>
> >> I don't get your idea here.
> >>
> >> What are you trying to make work?
> >> Why dw_hdmi_probe() can't be used?
> >> How does dw_hdmi_bind() help here?
> >
> > bind() is ok. but unbind(), then bind() there is an issue.
> >
> >>
> >>> But can't get the encoder pointer. the encoder pointer is from lcdif_drv.c,
> >>> the probe sequence of lcdif, pvi, dw_hdmi should be dw_hdmi first, then pvi,
> >>> then lcdif, because current implementation in lcdif and pvi driver.
> >>
> >> We use deferral probe to make sure the probe sequence is
> >> DW_HDMI -> PVI -> LCDIF.
> >>
> >> LCDIF driver would call devm_drm_of_get_bridge() to get the next bridge PVI
> >> and it defers probe if devm_drm_of_get_bridge() returns ERR_PTR(-EPROBE_DEFER).
> >> Same to PVI driver, it would call of_drm_find_bridge() to get the next bridge
> >> DW_HDMI and defers probe if needed.
> >
> > right, probe is no problem, but after probe, if unbind pai, hdmi_tx,
> > then bind
> > them again, there is a problem, because no one call the
> > drm_bridge_attach() again.
>
> In my mind, this is a common issue as DRM bridges are not properly detached
> and attached again.
> For now, only drm_encoder_cleanup() calls drm_bridge_detach().
>
> Anyway, this issue is not introduced by this patch series, i.e. it's already
> there.
Ok, thanks for clarification.
best regards
shengjiu Wang
>
> >
> >>
> >>>
> >>> Should the lcdif and pvi driver be modified to use component helper?
> >>
> >> Why should they use component helper?
> >>
> >> BTW, I've tried testing the snippets suggested by me on i.MX8MP EVK and
> >> the components bind successfully:
> >
> > right, probe is no problem. but if try to unbind() then bind, there is issue.
>
> I don't think the DRM bridge detach/attach issue would be addressed by
> using component helper.
>
> >
> > best regards
> > shengjiu Wang
> >>
> >> cat /sys/kernel/debug/device_component/32fd8000.hdmi
> >> aggregate_device name status
> >> -----------------------------------------------------------------------
> >> 32fd8000.hdmi bound
> >>
> >> device name status
> >> -----------------------------------------------------------------------
> >> 32fc4800.audio-bridge bound
> >>
> >>> This seems out of the scope of this patch set.
> >>>
> >>> Best regards
> >>> Shengjiu Wang
> >>
> >> [...]
> >>
> >> --
> >> Regards,
> >> Liu Ying
>
>
> --
> Regards,
> Liu Ying
On Tue, Aug 5, 2025 at 4:55 PM Liu Ying <victor.liu@nxp.com> wrote:
>
> On 08/04/2025, Shengjiu Wang wrote:
> > The HDMI TX Parallel Audio Interface (HTX_PAI) is a digital module that
> > acts as the bridge between the Audio Subsystem to the HDMI TX Controller.
> > This IP block is found in the HDMI subsystem of the i.MX8MP SoC.
> >
> > Data received from the audio subsystem can have an arbitrary component
> > ordering. The HTX_PAI block has integrated muxing options to select which
> > sections of the 32-bit input data word will be mapped to each IEC60958
> > field. The HTX_PAI_FIELD_CTRL register contains mux selects to
> > individually select P,C,U,V,Data, and Preamble.
> >
> > Use component helper that imx8mp-hdmi-tx will be aggregate driver,
>
> s/that/so that/
>
> > imx8mp-hdmi-pai will be component driver, then imx8mp-hdmi-pai can use
> > bind() ops to get the plat_data from imx8mp-hdmi-tx device.
> >
> > Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
> > ---
> > drivers/gpu/drm/bridge/imx/Kconfig | 8 +
> > drivers/gpu/drm/bridge/imx/Makefile | 1 +
> > drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c | 205 +++++++++++++++++++
> > drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c | 55 +++++
> > include/drm/bridge/dw_hdmi.h | 6 +
> > 5 files changed, 275 insertions(+)
> > create mode 100644 drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c
> >
> > diff --git a/drivers/gpu/drm/bridge/imx/Kconfig b/drivers/gpu/drm/bridge/imx/Kconfig
> > index 9a480c6abb85..6c1a8bc5d4a0 100644
> > --- a/drivers/gpu/drm/bridge/imx/Kconfig
> > +++ b/drivers/gpu/drm/bridge/imx/Kconfig
> > @@ -18,12 +18,20 @@ config DRM_IMX8MP_DW_HDMI_BRIDGE
> > depends on OF
> > depends on COMMON_CLK
> > select DRM_DW_HDMI
> > + imply DRM_IMX8MP_HDMI_PAI
> > imply DRM_IMX8MP_HDMI_PVI
> > imply PHY_FSL_SAMSUNG_HDMI_PHY
> > help
> > Choose this to enable support for the internal HDMI encoder found
> > on the i.MX8MP SoC.
> >
> > +config DRM_IMX8MP_HDMI_PAI
> > + tristate "Freescale i.MX8MP HDMI PAI bridge support"
> > + depends on OF
>
> select REGMAP
> select REGMAP_MMIO
will add them.
>
> > + help
> > + Choose this to enable support for the internal HDMI TX Parallel
> > + Audio Interface found on the Freescale i.MX8MP SoC.
> > +
> > config DRM_IMX8MP_HDMI_PVI
> > tristate "Freescale i.MX8MP HDMI PVI bridge support"
> > depends on OF
> > diff --git a/drivers/gpu/drm/bridge/imx/Makefile b/drivers/gpu/drm/bridge/imx/Makefile
> > index dd5d48584806..8d01fda25451 100644
> > --- a/drivers/gpu/drm/bridge/imx/Makefile
> > +++ b/drivers/gpu/drm/bridge/imx/Makefile
> > @@ -1,6 +1,7 @@
> > obj-$(CONFIG_DRM_IMX_LDB_HELPER) += imx-ldb-helper.o
> > obj-$(CONFIG_DRM_IMX_LEGACY_BRIDGE) += imx-legacy-bridge.o
> > obj-$(CONFIG_DRM_IMX8MP_DW_HDMI_BRIDGE) += imx8mp-hdmi-tx.o
> > +obj-$(CONFIG_DRM_IMX8MP_HDMI_PAI) += imx8mp-hdmi-pai.o
> > obj-$(CONFIG_DRM_IMX8MP_HDMI_PVI) += imx8mp-hdmi-pvi.o
> > obj-$(CONFIG_DRM_IMX8QM_LDB) += imx8qm-ldb.o
> > obj-$(CONFIG_DRM_IMX8QXP_LDB) += imx8qxp-ldb.o
> > diff --git a/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c
> > new file mode 100644
> > index 000000000000..9002974073ca
> > --- /dev/null
> > +++ b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c
> > @@ -0,0 +1,205 @@
> > +// SPDX-License-Identifier: GPL-2.0+
> > +/*
> > + * Copyright 2025 NXP
> > + */
> > +
> > +#include <linux/bitfield.h>
> > +#include <linux/component.h>
> > +#include <linux/module.h>
> > +#include <linux/of_platform.h>
> > +#include <linux/platform_device.h>
>
> #include <linux/regmap.h>
ok,
>
> > +#include <drm/bridge/dw_hdmi.h>
> > +#include <sound/asoundef.h>
> > +
> > +#define HTX_PAI_CTRL 0x00
> > +#define ENABLE BIT(0)
> > +
> > +#define HTX_PAI_CTRL_EXT 0x04
> > +#define WTMK_HIGH_MASK GENMASK(31, 24)
> > +#define WTMK_LOW_MASK GENMASK(23, 16)
> > +#define NUM_CH_MASK GENMASK(10, 8)
>
> Add NUM_CH(n) and use it when programming HTX_PAI_CTRL_EXT.
> #define NUM_CH(n) FIELD_PREP(NUM_CH_MASK, (n - 1))
Ok, will add it.
>
> > +#define WTMK_HIGH(n) FIELD_PREP(WTMK_HIGH_MASK, (n))
> > +#define WTMK_LOW(n) FIELD_PREP(WTMK_LOW_MASK, (n))
> > +
> > +#define HTX_PAI_FIELD_CTRL 0x08
> > +#define B_FILT BIT(31)
> > +#define PARITY_EN BIT(30)
> > +#define END_SEL BIT(29)
>
> The above 3 bits are unused. Drop.
Ok.
>
> > +#define PRE_SEL GENMASK(28, 24)
> > +#define D_SEL GENMASK(23, 20)
> > +#define V_SEL GENMASK(19, 15)
> > +#define U_SEL GENMASK(14, 10)
> > +#define C_SEL GENMASK(9, 5)
> > +#define P_SEL GENMASK(4, 0)
> > +
> > +#define HTX_PAI_STAT 0x0c
> > +#define HTX_PAI_IRQ_NOMASK 0x10
> > +#define HTX_PAI_IRQ_MASKED 0x14
> > +#define HTX_PAI_IRQ_MASK 0x18
>
> The above 4 registers are not pratically used. Drop.
They are used by regmap to make a full definition.
>
> > +
> > +struct imx8mp_hdmi_pai {
> > + struct device *dev;
> > + struct regmap *regmap;
> > +};
> > +
> > +static void imx8mp_hdmi_pai_enable(struct dw_hdmi *dw_hdmi, int channel,
> > + int width, int rate, int non_pcm,
> > + int iec958)
> > +{
> > + const struct dw_hdmi_plat_data *pdata = dw_hdmi_to_plat_data(dw_hdmi);
> > + struct imx8mp_hdmi_pai *hdmi_pai = (struct imx8mp_hdmi_pai *)pdata->priv_audio;
>
> I don't think you need to convert type explicitly. Same for the other
> explicit conversions in this driver.
ok, can be removed.
>
> > + int val;
> > +
> > + /* PAI set control extended */
> > + val = WTMK_HIGH(3) | WTMK_LOW(3);
> > + val |= FIELD_PREP(NUM_CH_MASK, channel - 1);
> > + regmap_write(hdmi_pai->regmap, HTX_PAI_CTRL_EXT, val);
> > +
> > + /* IEC60958 format */
> > + if (iec958) {
> > + val = FIELD_PREP_CONST(P_SEL,
> > + __bf_shf(IEC958_SUBFRAME_PARITY));
> > + val |= FIELD_PREP_CONST(C_SEL,
> > + __bf_shf(IEC958_SUBFRAME_CHANNEL_STATUS));
> > + val |= FIELD_PREP_CONST(U_SEL,
> > + __bf_shf(IEC958_SUBFRAME_USER_DATA));
> > + val |= FIELD_PREP_CONST(V_SEL,
> > + __bf_shf(IEC958_SUBFRAME_VALIDITY));
> > + val |= FIELD_PREP_CONST(D_SEL,
> > + __bf_shf(IEC958_SUBFRAME_SAMPLE_24_MASK));
> > + val |= FIELD_PREP_CONST(PRE_SEL,
> > + __bf_shf(IEC958_SUBFRAME_PREAMBLE_MASK));
> > + } else {
> > + /* PCM choose 24bit*/
> > + val = FIELD_PREP(D_SEL, width - 24);
>
> Why 'width - 24'? Can it be expressed by a helper or macro?
/*
* The allowed width are 24bit and 32bit, as they are
supported by
* aud2htx module.
* for 24bit, D_SEL = 0, select all the bits.
* for 32bit, D_SEL = 8, select the MSB.
*/
will add such comments.
best regards
Shengjiu wang
>
> > + }
> > +
> > + regmap_write(hdmi_pai->regmap, HTX_PAI_FIELD_CTRL, val);
> > +
> > + /* PAI start running */
> > + regmap_write(hdmi_pai->regmap, HTX_PAI_CTRL, ENABLE);
> > +}
> > +
> > +static void imx8mp_hdmi_pai_disable(struct dw_hdmi *dw_hdmi)
> > +{
> > + const struct dw_hdmi_plat_data *pdata = dw_hdmi_to_plat_data(dw_hdmi);
> > + struct imx8mp_hdmi_pai *hdmi_pai = (struct imx8mp_hdmi_pai *)pdata->priv_audio;
> > +
> > + /* Stop PAI */
> > + regmap_write(hdmi_pai->regmap, HTX_PAI_CTRL, 0);
> > +}
> > +
> > +static int imx8mp_hdmi_pai_bind(struct device *dev, struct device *master, void *data)
> > +{
> > + struct dw_hdmi_plat_data *plat_data = (struct dw_hdmi_plat_data *)data;
> > + struct imx8mp_hdmi_pai *hdmi_pai;
> > +
> > + hdmi_pai = dev_get_drvdata(dev);
> > +
> > + plat_data->enable_audio = imx8mp_hdmi_pai_enable;
> > + plat_data->disable_audio = imx8mp_hdmi_pai_disable;
> > + plat_data->priv_audio = hdmi_pai;
> > +
> > + return 0;
> > +}
> > +
> > +static void imx8mp_hdmi_pai_unbind(struct device *dev, struct device *master, void *data)
> > +{
> > + struct dw_hdmi_plat_data *plat_data = (struct dw_hdmi_plat_data *)data;
> > +
> > + plat_data->enable_audio = NULL;
> > + plat_data->disable_audio = NULL;
> > + plat_data->priv_audio = NULL;
>
> Do you really need to set these ptrs to NULL?
>
> > +}
> > +
> > +static const struct component_ops imx8mp_hdmi_pai_ops = {
> > + .bind = imx8mp_hdmi_pai_bind,
> > + .unbind = imx8mp_hdmi_pai_unbind,
> > +};
> > +
> > +static bool imx8mp_hdmi_pai_volatile_reg(struct device *dev, unsigned int reg)
> > +{
> > + switch (reg) {
> > + case HTX_PAI_IRQ_NOMASK:
> > + case HTX_PAI_IRQ_MASKED:
> > + return true;
> > + default:
> > + return false;
> > + }
> > +}
> > +
> > +static bool imx8mp_hdmi_pai_writeable_reg(struct device *dev, unsigned int reg)
> > +{
> > + switch (reg) {
> > + case HTX_PAI_CTRL:
> > + case HTX_PAI_CTRL_EXT:
> > + case HTX_PAI_FIELD_CTRL:
> > + case HTX_PAI_IRQ_NOMASK:
> > + case HTX_PAI_IRQ_MASKED:
> > + case HTX_PAI_IRQ_MASK:
> > + return true;
> > + default:
> > + return false;
> > + }
> > +}
> > +
> > +static const struct regmap_config imx8mp_hdmi_pai_regmap_config = {
> > + .reg_bits = 32,
> > + .reg_stride = 4,
> > + .val_bits = 32,
> > + .max_register = HTX_PAI_IRQ_MASK,
> > + .volatile_reg = imx8mp_hdmi_pai_volatile_reg,
> > + .writeable_reg = imx8mp_hdmi_pai_writeable_reg,
> > +};
> > +
> > +static int imx8mp_hdmi_pai_probe(struct platform_device *pdev)
> > +{
> > + struct device *dev = &pdev->dev;
> > + struct imx8mp_hdmi_pai *hdmi_pai;
> > + struct resource *res;
> > + void __iomem *base;
> > +
> > + hdmi_pai = devm_kzalloc(dev, sizeof(*hdmi_pai), GFP_KERNEL);
> > + if (!hdmi_pai)
> > + return -ENOMEM;
> > +
> > + base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
> > + if (IS_ERR(base))
> > + return PTR_ERR(base);
> > +
> > + hdmi_pai->dev = dev;
> > +
> > + hdmi_pai->regmap = devm_regmap_init_mmio(dev, base, &imx8mp_hdmi_pai_regmap_config);
>
> Now that DT binding says there is an APB clock, use devm_regmap_init_mmio_clk()
> to ensure registers can be accessed with clock enabled even via debugfs.
>
> > + if (IS_ERR(hdmi_pai->regmap)) {
> > + dev_err(dev, "regmap init failed\n");
> > + return PTR_ERR(hdmi_pai->regmap);
> > + }
> > +
> > + dev_set_drvdata(dev, hdmi_pai);
> > +
> > + return component_add(dev, &imx8mp_hdmi_pai_ops);
>
> Imagine that users could enable this driver without enabling imx8mp-hdmi-tx
> driver, you may add the component in this probe() callback only and move all
> the other stuff to bind() callback to avoid unnecessary things being done here.
>
> > +}
> > +
> > +static void imx8mp_hdmi_pai_remove(struct platform_device *pdev)
> > +{
> > + component_del(&pdev->dev, &imx8mp_hdmi_pai_ops);
> > +}
> > +
> > +static const struct of_device_id imx8mp_hdmi_pai_of_table[] = {
> > + { .compatible = "fsl,imx8mp-hdmi-pai" },
> > + { /* Sentinel */ }
> > +};
> > +MODULE_DEVICE_TABLE(of, imx8mp_hdmi_pai_of_table);
> > +
> > +static struct platform_driver imx8mp_hdmi_pai_platform_driver = {
> > + .probe = imx8mp_hdmi_pai_probe,
> > + .remove = imx8mp_hdmi_pai_remove,
> > + .driver = {
> > + .name = "imx8mp-hdmi-pai",
> > + .of_match_table = imx8mp_hdmi_pai_of_table,
> > + },
> > +};
> > +module_platform_driver(imx8mp_hdmi_pai_platform_driver);
> > +
> > +MODULE_DESCRIPTION("i.MX8MP HDMI PAI driver");
> > +MODULE_LICENSE("GPL");
> > diff --git a/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c
> > index 1e7a789ec289..ee08084d2394 100644
> > --- a/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c
> > +++ b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c
> > @@ -5,11 +5,13 @@
> > */
> >
> > #include <linux/clk.h>
> > +#include <linux/component.h>
> > #include <linux/mod_devicetable.h>
> > #include <linux/module.h>
> > #include <linux/platform_device.h>
> > #include <drm/bridge/dw_hdmi.h>
> > #include <drm/drm_modes.h>
> > +#include <drm/drm_of.h>
> >
> > struct imx8mp_hdmi {
> > struct dw_hdmi_plat_data plat_data;
> > @@ -79,11 +81,46 @@ static const struct dw_hdmi_phy_ops imx8mp_hdmi_phy_ops = {
> > .update_hpd = dw_hdmi_phy_update_hpd,
> > };
> >
> > +static int imx8mp_dw_hdmi_bind(struct device *dev)
> > +{
> > + struct dw_hdmi_plat_data *plat_data;
> > + struct imx8mp_hdmi *hdmi;
> > + int ret;
> > +
> > + hdmi = dev_get_drvdata(dev);
> > + plat_data = &hdmi->plat_data;
> > +
> > + ret = component_bind_all(dev, plat_data);
> > + if (ret)
> > + return dev_err_probe(dev, ret, "component_bind_all failed!\n");
>
> As component_bind_all() would bind imx8mp-hdmi-pai and hence set
> {enable,disable}_audio callbacks, you need to call dw_hdmi_probe() after
> component_bind_all() instead of too early in probe() callback.
>
> > +
> > + return 0;
> > +}
> > +
> > +static void imx8mp_dw_hdmi_unbind(struct device *dev)
> > +{
> > + struct dw_hdmi_plat_data *plat_data;
> > + struct imx8mp_hdmi *hdmi;
> > +
> > + hdmi = dev_get_drvdata(dev);
> > + plat_data = &hdmi->plat_data;
> > +
> > + component_unbind_all(dev, plat_data);
> > +}
> > +
> > +static const struct component_master_ops imx8mp_dw_hdmi_ops = {
> > + .bind = imx8mp_dw_hdmi_bind,
> > + .unbind = imx8mp_dw_hdmi_unbind,
> > +};
> > +
> > static int imx8mp_dw_hdmi_probe(struct platform_device *pdev)
> > {
> > struct device *dev = &pdev->dev;
> > struct dw_hdmi_plat_data *plat_data;
> > + struct component_match *match;
>
> As Alexander pointed out, this needs to be set to NULL.
> See how other drivers which are component masters do.
>
> > + struct device_node *remote;
> > struct imx8mp_hdmi *hdmi;
> > + int ret;
> >
> > hdmi = devm_kzalloc(dev, sizeof(*hdmi), GFP_KERNEL);
> > if (!hdmi)
> > @@ -108,6 +145,22 @@ static int imx8mp_dw_hdmi_probe(struct platform_device *pdev)
> >
> > platform_set_drvdata(pdev, hdmi);
> >
> > + /* port@2 is for hdmi_pai device */
> > + remote = of_graph_get_remote_node(pdev->dev.of_node, 2, 0);
> > + if (remote && of_device_is_available(remote)) {
>
> Doesn't of_graph_get_remote_node() ensure that remote is avaiable?
>
> > + drm_of_component_match_add(dev, &match, component_compare_of, remote);
> > +
> > + of_node_put(remote);
> > +
> > + ret = component_master_add_with_match(dev, &imx8mp_dw_hdmi_ops, match);
> > + if (ret)
> > + dev_warn(dev, "Unable to register aggregate driver\n");
> > + /*
> > + * This audio function is optional for avoid blocking display.
> > + * So just print warning message and no error is returned.
>
> No, since PAI node is available here, it has to be bound. Yet you still need
> to properly handle the case where PAI node is inavailable.
>
> > + */
> > + }
> > +
> > return 0;
> > }
> >
> > @@ -115,6 +168,8 @@ static void imx8mp_dw_hdmi_remove(struct platform_device *pdev)
> > {
> > struct imx8mp_hdmi *hdmi = platform_get_drvdata(pdev);
> >
> > + component_master_del(&pdev->dev, &imx8mp_dw_hdmi_ops);
> > +
> > dw_hdmi_remove(hdmi->dw_hdmi);
> > }
> >
> > diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h
> > index 095cdd9b7424..336f062e1f9d 100644
> > --- a/include/drm/bridge/dw_hdmi.h
> > +++ b/include/drm/bridge/dw_hdmi.h
> > @@ -143,6 +143,12 @@ struct dw_hdmi_plat_data {
> > const struct drm_display_info *info,
> > const struct drm_display_mode *mode);
> >
> > + /*
> > + * priv_audio is specially used for additional audio device to get
> > + * driver data through this dw_hdmi_plat_data.
> > + */
> > + void *priv_audio;
> > +
> > /* Platform-specific audio enable/disable (optional) */
> > void (*enable_audio)(struct dw_hdmi *hdmi, int channel,
> > int width, int rate, int non_pcm, int iec958);
>
>
> --
> Regards,
> Liu Ying
On 08/06/2025, Shengjiu Wang wrote: > On Tue, Aug 5, 2025 at 4:55 PM Liu Ying <victor.liu@nxp.com> wrote: >> >> On 08/04/2025, Shengjiu Wang wrote: [...] >>> +#define HTX_PAI_STAT 0x0c >>> +#define HTX_PAI_IRQ_NOMASK 0x10 >>> +#define HTX_PAI_IRQ_MASKED 0x14 >>> +#define HTX_PAI_IRQ_MASK 0x18 >> >> The above 4 registers are not pratically used. Drop. > > They are used by regmap to make a full definition. Yes, but they are not pratically used for interrupt support. Once you add interrupt support in this driver, you may add these registers. [...] >>> + /* PCM choose 24bit*/ >>> + val = FIELD_PREP(D_SEL, width - 24); >> >> Why 'width - 24'? Can it be expressed by a helper or macro? > > /* > * The allowed width are 24bit and 32bit, as they are > supported by > * aud2htx module. > * for 24bit, D_SEL = 0, select all the bits. > * for 32bit, D_SEL = 8, select the MSB. > */ > will add such comments. Fine for me(Not an audio guy though). -- Regards, Liu Ying
Hi Shengjiu, kernel test robot noticed the following build errors: [auto build test ERROR on shawnguo/for-next] [also build test ERROR on robh/for-next tiwai-sound/for-next tiwai-sound/for-linus linus/master v6.16 next-20250805] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Shengjiu-Wang/dt-bindings-display-imx-add-HDMI-PAI-for-i-MX8MP/20250804-185254 base: https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git for-next patch link: https://lore.kernel.org/r/20250804104722.601440-6-shengjiu.wang%40nxp.com patch subject: [PATCH v3 5/6] drm/bridge: imx: add driver for HDMI TX Parallel Audio Interface config: xtensa-randconfig-001-20250805 (https://download.01.org/0day-ci/archive/20250805/202508052225.u407ulE0-lkp@intel.com/config) compiler: xtensa-linux-gcc (GCC) 14.3.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250805/202508052225.u407ulE0-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202508052225.u407ulE0-lkp@intel.com/ All errors (new ones prefixed by >>): `.exit.text' referenced in section `__jump_table' of lib/test_dynamic_debug.o: defined in discarded section `.exit.text' of lib/test_dynamic_debug.o `.exit.text' referenced in section `__jump_table' of lib/test_dynamic_debug.o: defined in discarded section `.exit.text' of lib/test_dynamic_debug.o xtensa-linux-ld: drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.o: in function `imx8mp_hdmi_pai_remove': >> imx8mp-hdmi-pai.c:(.text+0x8c): undefined reference to `dw_hdmi_to_plat_data' xtensa-linux-ld: drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.o: in function `imx8mp_hdmi_pai_disable': imx8mp-hdmi-pai.c:(.text+0x9a): undefined reference to `dw_hdmi_to_plat_data' >> xtensa-linux-ld: imx8mp-hdmi-pai.c:(.text+0xbc): undefined reference to `dw_hdmi_to_plat_data' xtensa-linux-ld: drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.o: in function `imx8mp_hdmi_pai_enable': imx8mp-hdmi-pai.c:(.text+0xd2): undefined reference to `dw_hdmi_to_plat_data' `.exit.text' referenced in section `__jump_table' of net/ceph/ceph_common.o: defined in discarded section `.exit.text' of net/ceph/ceph_common.o `.exit.text' referenced in section `__jump_table' of net/ceph/ceph_common.o: defined in discarded section `.exit.text' of net/ceph/ceph_common.o -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Hi,
Am Montag, 4. August 2025, 12:47:21 CEST schrieb Shengjiu Wang:
> The HDMI TX Parallel Audio Interface (HTX_PAI) is a digital module that
> acts as the bridge between the Audio Subsystem to the HDMI TX Controller.
> This IP block is found in the HDMI subsystem of the i.MX8MP SoC.
>
> Data received from the audio subsystem can have an arbitrary component
> ordering. The HTX_PAI block has integrated muxing options to select which
> sections of the 32-bit input data word will be mapped to each IEC60958
> field. The HTX_PAI_FIELD_CTRL register contains mux selects to
> individually select P,C,U,V,Data, and Preamble.
>
> Use component helper that imx8mp-hdmi-tx will be aggregate driver,
> imx8mp-hdmi-pai will be component driver, then imx8mp-hdmi-pai can use
> bind() ops to get the plat_data from imx8mp-hdmi-tx device.
>
> Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
> ---
> drivers/gpu/drm/bridge/imx/Kconfig | 8 +
> drivers/gpu/drm/bridge/imx/Makefile | 1 +
> drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c | 205 +++++++++++++++++++
> drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c | 55 +++++
> include/drm/bridge/dw_hdmi.h | 6 +
> 5 files changed, 275 insertions(+)
> create mode 100644 drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c
>
> diff --git a/drivers/gpu/drm/bridge/imx/Kconfig b/drivers/gpu/drm/bridge/imx/Kconfig
> index 9a480c6abb85..6c1a8bc5d4a0 100644
> --- a/drivers/gpu/drm/bridge/imx/Kconfig
> +++ b/drivers/gpu/drm/bridge/imx/Kconfig
> @@ -18,12 +18,20 @@ config DRM_IMX8MP_DW_HDMI_BRIDGE
> depends on OF
> depends on COMMON_CLK
> select DRM_DW_HDMI
> + imply DRM_IMX8MP_HDMI_PAI
> imply DRM_IMX8MP_HDMI_PVI
> imply PHY_FSL_SAMSUNG_HDMI_PHY
> help
> Choose this to enable support for the internal HDMI encoder found
> on the i.MX8MP SoC.
>
> +config DRM_IMX8MP_HDMI_PAI
> + tristate "Freescale i.MX8MP HDMI PAI bridge support"
> + depends on OF
> + help
> + Choose this to enable support for the internal HDMI TX Parallel
> + Audio Interface found on the Freescale i.MX8MP SoC.
> +
> config DRM_IMX8MP_HDMI_PVI
> tristate "Freescale i.MX8MP HDMI PVI bridge support"
> depends on OF
> diff --git a/drivers/gpu/drm/bridge/imx/Makefile b/drivers/gpu/drm/bridge/imx/Makefile
> index dd5d48584806..8d01fda25451 100644
> --- a/drivers/gpu/drm/bridge/imx/Makefile
> +++ b/drivers/gpu/drm/bridge/imx/Makefile
> @@ -1,6 +1,7 @@
> obj-$(CONFIG_DRM_IMX_LDB_HELPER) += imx-ldb-helper.o
> obj-$(CONFIG_DRM_IMX_LEGACY_BRIDGE) += imx-legacy-bridge.o
> obj-$(CONFIG_DRM_IMX8MP_DW_HDMI_BRIDGE) += imx8mp-hdmi-tx.o
> +obj-$(CONFIG_DRM_IMX8MP_HDMI_PAI) += imx8mp-hdmi-pai.o
> obj-$(CONFIG_DRM_IMX8MP_HDMI_PVI) += imx8mp-hdmi-pvi.o
> obj-$(CONFIG_DRM_IMX8QM_LDB) += imx8qm-ldb.o
> obj-$(CONFIG_DRM_IMX8QXP_LDB) += imx8qxp-ldb.o
> diff --git a/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c
> new file mode 100644
> index 000000000000..9002974073ca
> --- /dev/null
> +++ b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c
> @@ -0,0 +1,205 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright 2025 NXP
> + */
> +
> +#include <linux/bitfield.h>
> +#include <linux/component.h>
> +#include <linux/module.h>
> +#include <linux/of_platform.h>
> +#include <linux/platform_device.h>
> +#include <drm/bridge/dw_hdmi.h>
> +#include <sound/asoundef.h>
> +
> +#define HTX_PAI_CTRL 0x00
> +#define ENABLE BIT(0)
> +
> +#define HTX_PAI_CTRL_EXT 0x04
> +#define WTMK_HIGH_MASK GENMASK(31, 24)
> +#define WTMK_LOW_MASK GENMASK(23, 16)
> +#define NUM_CH_MASK GENMASK(10, 8)
> +#define WTMK_HIGH(n) FIELD_PREP(WTMK_HIGH_MASK, (n))
> +#define WTMK_LOW(n) FIELD_PREP(WTMK_LOW_MASK, (n))
> +
> +#define HTX_PAI_FIELD_CTRL 0x08
> +#define B_FILT BIT(31)
> +#define PARITY_EN BIT(30)
> +#define END_SEL BIT(29)
> +#define PRE_SEL GENMASK(28, 24)
> +#define D_SEL GENMASK(23, 20)
> +#define V_SEL GENMASK(19, 15)
> +#define U_SEL GENMASK(14, 10)
> +#define C_SEL GENMASK(9, 5)
> +#define P_SEL GENMASK(4, 0)
> +
> +#define HTX_PAI_STAT 0x0c
> +#define HTX_PAI_IRQ_NOMASK 0x10
> +#define HTX_PAI_IRQ_MASKED 0x14
> +#define HTX_PAI_IRQ_MASK 0x18
> +
> +struct imx8mp_hdmi_pai {
> + struct device *dev;
> + struct regmap *regmap;
> +};
> +
> +static void imx8mp_hdmi_pai_enable(struct dw_hdmi *dw_hdmi, int channel,
> + int width, int rate, int non_pcm,
> + int iec958)
> +{
> + const struct dw_hdmi_plat_data *pdata = dw_hdmi_to_plat_data(dw_hdmi);
> + struct imx8mp_hdmi_pai *hdmi_pai = (struct imx8mp_hdmi_pai *)pdata->priv_audio;
> + int val;
> +
> + /* PAI set control extended */
> + val = WTMK_HIGH(3) | WTMK_LOW(3);
> + val |= FIELD_PREP(NUM_CH_MASK, channel - 1);
> + regmap_write(hdmi_pai->regmap, HTX_PAI_CTRL_EXT, val);
> +
> + /* IEC60958 format */
> + if (iec958) {
> + val = FIELD_PREP_CONST(P_SEL,
> + __bf_shf(IEC958_SUBFRAME_PARITY));
> + val |= FIELD_PREP_CONST(C_SEL,
> + __bf_shf(IEC958_SUBFRAME_CHANNEL_STATUS));
> + val |= FIELD_PREP_CONST(U_SEL,
> + __bf_shf(IEC958_SUBFRAME_USER_DATA));
> + val |= FIELD_PREP_CONST(V_SEL,
> + __bf_shf(IEC958_SUBFRAME_VALIDITY));
> + val |= FIELD_PREP_CONST(D_SEL,
> + __bf_shf(IEC958_SUBFRAME_SAMPLE_24_MASK));
> + val |= FIELD_PREP_CONST(PRE_SEL,
> + __bf_shf(IEC958_SUBFRAME_PREAMBLE_MASK));
> + } else {
> + /* PCM choose 24bit*/
> + val = FIELD_PREP(D_SEL, width - 24);
> + }
> +
> + regmap_write(hdmi_pai->regmap, HTX_PAI_FIELD_CTRL, val);
> +
> + /* PAI start running */
> + regmap_write(hdmi_pai->regmap, HTX_PAI_CTRL, ENABLE);
> +}
> +
> +static void imx8mp_hdmi_pai_disable(struct dw_hdmi *dw_hdmi)
> +{
> + const struct dw_hdmi_plat_data *pdata = dw_hdmi_to_plat_data(dw_hdmi);
> + struct imx8mp_hdmi_pai *hdmi_pai = (struct imx8mp_hdmi_pai *)pdata->priv_audio;
> +
> + /* Stop PAI */
> + regmap_write(hdmi_pai->regmap, HTX_PAI_CTRL, 0);
> +}
> +
> +static int imx8mp_hdmi_pai_bind(struct device *dev, struct device *master, void *data)
> +{
> + struct dw_hdmi_plat_data *plat_data = (struct dw_hdmi_plat_data *)data;
> + struct imx8mp_hdmi_pai *hdmi_pai;
> +
> + hdmi_pai = dev_get_drvdata(dev);
> +
> + plat_data->enable_audio = imx8mp_hdmi_pai_enable;
> + plat_data->disable_audio = imx8mp_hdmi_pai_disable;
> + plat_data->priv_audio = hdmi_pai;
> +
> + return 0;
> +}
> +
> +static void imx8mp_hdmi_pai_unbind(struct device *dev, struct device *master, void *data)
> +{
> + struct dw_hdmi_plat_data *plat_data = (struct dw_hdmi_plat_data *)data;
> +
> + plat_data->enable_audio = NULL;
> + plat_data->disable_audio = NULL;
> + plat_data->priv_audio = NULL;
> +}
> +
> +static const struct component_ops imx8mp_hdmi_pai_ops = {
> + .bind = imx8mp_hdmi_pai_bind,
> + .unbind = imx8mp_hdmi_pai_unbind,
> +};
> +
> +static bool imx8mp_hdmi_pai_volatile_reg(struct device *dev, unsigned int reg)
> +{
> + switch (reg) {
> + case HTX_PAI_IRQ_NOMASK:
> + case HTX_PAI_IRQ_MASKED:
> + return true;
> + default:
> + return false;
> + }
> +}
> +
> +static bool imx8mp_hdmi_pai_writeable_reg(struct device *dev, unsigned int reg)
> +{
> + switch (reg) {
> + case HTX_PAI_CTRL:
> + case HTX_PAI_CTRL_EXT:
> + case HTX_PAI_FIELD_CTRL:
> + case HTX_PAI_IRQ_NOMASK:
> + case HTX_PAI_IRQ_MASKED:
> + case HTX_PAI_IRQ_MASK:
> + return true;
> + default:
> + return false;
> + }
> +}
> +
> +static const struct regmap_config imx8mp_hdmi_pai_regmap_config = {
> + .reg_bits = 32,
> + .reg_stride = 4,
> + .val_bits = 32,
> + .max_register = HTX_PAI_IRQ_MASK,
> + .volatile_reg = imx8mp_hdmi_pai_volatile_reg,
> + .writeable_reg = imx8mp_hdmi_pai_writeable_reg,
> +};
> +
> +static int imx8mp_hdmi_pai_probe(struct platform_device *pdev)
> +{
> + struct device *dev = &pdev->dev;
> + struct imx8mp_hdmi_pai *hdmi_pai;
> + struct resource *res;
> + void __iomem *base;
> +
> + hdmi_pai = devm_kzalloc(dev, sizeof(*hdmi_pai), GFP_KERNEL);
> + if (!hdmi_pai)
> + return -ENOMEM;
> +
> + base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
> + if (IS_ERR(base))
> + return PTR_ERR(base);
> +
> + hdmi_pai->dev = dev;
> +
> + hdmi_pai->regmap = devm_regmap_init_mmio(dev, base, &imx8mp_hdmi_pai_regmap_config);
> + if (IS_ERR(hdmi_pai->regmap)) {
> + dev_err(dev, "regmap init failed\n");
> + return PTR_ERR(hdmi_pai->regmap);
> + }
> +
> + dev_set_drvdata(dev, hdmi_pai);
> +
> + return component_add(dev, &imx8mp_hdmi_pai_ops);
> +}
> +
> +static void imx8mp_hdmi_pai_remove(struct platform_device *pdev)
> +{
> + component_del(&pdev->dev, &imx8mp_hdmi_pai_ops);
> +}
> +
> +static const struct of_device_id imx8mp_hdmi_pai_of_table[] = {
> + { .compatible = "fsl,imx8mp-hdmi-pai" },
> + { /* Sentinel */ }
> +};
> +MODULE_DEVICE_TABLE(of, imx8mp_hdmi_pai_of_table);
> +
> +static struct platform_driver imx8mp_hdmi_pai_platform_driver = {
> + .probe = imx8mp_hdmi_pai_probe,
> + .remove = imx8mp_hdmi_pai_remove,
> + .driver = {
> + .name = "imx8mp-hdmi-pai",
> + .of_match_table = imx8mp_hdmi_pai_of_table,
> + },
> +};
> +module_platform_driver(imx8mp_hdmi_pai_platform_driver);
> +
> +MODULE_DESCRIPTION("i.MX8MP HDMI PAI driver");
> +MODULE_LICENSE("GPL");
> diff --git a/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c
> index 1e7a789ec289..ee08084d2394 100644
> --- a/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c
> +++ b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c
> @@ -5,11 +5,13 @@
> */
>
> #include <linux/clk.h>
> +#include <linux/component.h>
> #include <linux/mod_devicetable.h>
> #include <linux/module.h>
> #include <linux/platform_device.h>
> #include <drm/bridge/dw_hdmi.h>
> #include <drm/drm_modes.h>
> +#include <drm/drm_of.h>
>
> struct imx8mp_hdmi {
> struct dw_hdmi_plat_data plat_data;
> @@ -79,11 +81,46 @@ static const struct dw_hdmi_phy_ops imx8mp_hdmi_phy_ops = {
> .update_hpd = dw_hdmi_phy_update_hpd,
> };
>
> +static int imx8mp_dw_hdmi_bind(struct device *dev)
> +{
> + struct dw_hdmi_plat_data *plat_data;
> + struct imx8mp_hdmi *hdmi;
> + int ret;
> +
> + hdmi = dev_get_drvdata(dev);
> + plat_data = &hdmi->plat_data;
> +
> + ret = component_bind_all(dev, plat_data);
Do you really need plat_data variable?
> + if (ret)
> + return dev_err_probe(dev, ret, "component_bind_all failed!\n");
> +
> + return 0;
> +}
> +
> +static void imx8mp_dw_hdmi_unbind(struct device *dev)
> +{
> + struct dw_hdmi_plat_data *plat_data;
> + struct imx8mp_hdmi *hdmi;
> +
> + hdmi = dev_get_drvdata(dev);
> + plat_data = &hdmi->plat_data;
> +
> + component_unbind_all(dev, plat_data);
Do you really need plat_data variable?
> +}
> +
> +static const struct component_master_ops imx8mp_dw_hdmi_ops = {
> + .bind = imx8mp_dw_hdmi_bind,
> + .unbind = imx8mp_dw_hdmi_unbind,
> +};
> +
> static int imx8mp_dw_hdmi_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> struct dw_hdmi_plat_data *plat_data;
> + struct component_match *match;
Set match = NULL for drm_of_component_match_add (and subcalls) to allocate memory.
Best regards
Alexander
> + struct device_node *remote;
> struct imx8mp_hdmi *hdmi;
> + int ret;
>
> hdmi = devm_kzalloc(dev, sizeof(*hdmi), GFP_KERNEL);
> if (!hdmi)
> @@ -108,6 +145,22 @@ static int imx8mp_dw_hdmi_probe(struct platform_device *pdev)
>
> platform_set_drvdata(pdev, hdmi);
>
> + /* port@2 is for hdmi_pai device */
> + remote = of_graph_get_remote_node(pdev->dev.of_node, 2, 0);
> + if (remote && of_device_is_available(remote)) {
> + drm_of_component_match_add(dev, &match, component_compare_of, remote);
> +
> + of_node_put(remote);
> +
> + ret = component_master_add_with_match(dev, &imx8mp_dw_hdmi_ops, match);
> + if (ret)
> + dev_warn(dev, "Unable to register aggregate driver\n");
> + /*
> + * This audio function is optional for avoid blocking display.
> + * So just print warning message and no error is returned.
> + */
> + }
> +
> return 0;
> }
>
> @@ -115,6 +168,8 @@ static void imx8mp_dw_hdmi_remove(struct platform_device *pdev)
> {
> struct imx8mp_hdmi *hdmi = platform_get_drvdata(pdev);
>
> + component_master_del(&pdev->dev, &imx8mp_dw_hdmi_ops);
> +
> dw_hdmi_remove(hdmi->dw_hdmi);
> }
>
> diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h
> index 095cdd9b7424..336f062e1f9d 100644
> --- a/include/drm/bridge/dw_hdmi.h
> +++ b/include/drm/bridge/dw_hdmi.h
> @@ -143,6 +143,12 @@ struct dw_hdmi_plat_data {
> const struct drm_display_info *info,
> const struct drm_display_mode *mode);
>
> + /*
> + * priv_audio is specially used for additional audio device to get
> + * driver data through this dw_hdmi_plat_data.
> + */
> + void *priv_audio;
> +
> /* Platform-specific audio enable/disable (optional) */
> void (*enable_audio)(struct dw_hdmi *hdmi, int channel,
> int width, int rate, int non_pcm, int iec958);
>
--
TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany
Amtsgericht München, HRB 105018
Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider
http://www.tq-group.com/
On Tue, Aug 5, 2025 at 3:09 PM Alexander Stein
<alexander.stein@ew.tq-group.com> wrote:
>
> Hi,
>
> Am Montag, 4. August 2025, 12:47:21 CEST schrieb Shengjiu Wang:
> > The HDMI TX Parallel Audio Interface (HTX_PAI) is a digital module that
> > acts as the bridge between the Audio Subsystem to the HDMI TX Controller.
> > This IP block is found in the HDMI subsystem of the i.MX8MP SoC.
> >
> > Data received from the audio subsystem can have an arbitrary component
> > ordering. The HTX_PAI block has integrated muxing options to select which
> > sections of the 32-bit input data word will be mapped to each IEC60958
> > field. The HTX_PAI_FIELD_CTRL register contains mux selects to
> > individually select P,C,U,V,Data, and Preamble.
> >
> > Use component helper that imx8mp-hdmi-tx will be aggregate driver,
> > imx8mp-hdmi-pai will be component driver, then imx8mp-hdmi-pai can use
> > bind() ops to get the plat_data from imx8mp-hdmi-tx device.
> >
> > Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
> > ---
> > drivers/gpu/drm/bridge/imx/Kconfig | 8 +
> > drivers/gpu/drm/bridge/imx/Makefile | 1 +
> > drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c | 205 +++++++++++++++++++
> > drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c | 55 +++++
> > include/drm/bridge/dw_hdmi.h | 6 +
> > 5 files changed, 275 insertions(+)
> > create mode 100644 drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c
> >
> > diff --git a/drivers/gpu/drm/bridge/imx/Kconfig b/drivers/gpu/drm/bridge/imx/Kconfig
> > index 9a480c6abb85..6c1a8bc5d4a0 100644
> > --- a/drivers/gpu/drm/bridge/imx/Kconfig
> > +++ b/drivers/gpu/drm/bridge/imx/Kconfig
> > @@ -18,12 +18,20 @@ config DRM_IMX8MP_DW_HDMI_BRIDGE
> > depends on OF
> > depends on COMMON_CLK
> > select DRM_DW_HDMI
> > + imply DRM_IMX8MP_HDMI_PAI
> > imply DRM_IMX8MP_HDMI_PVI
> > imply PHY_FSL_SAMSUNG_HDMI_PHY
> > help
> > Choose this to enable support for the internal HDMI encoder found
> > on the i.MX8MP SoC.
> >
> > +config DRM_IMX8MP_HDMI_PAI
> > + tristate "Freescale i.MX8MP HDMI PAI bridge support"
> > + depends on OF
> > + help
> > + Choose this to enable support for the internal HDMI TX Parallel
> > + Audio Interface found on the Freescale i.MX8MP SoC.
> > +
> > config DRM_IMX8MP_HDMI_PVI
> > tristate "Freescale i.MX8MP HDMI PVI bridge support"
> > depends on OF
> > diff --git a/drivers/gpu/drm/bridge/imx/Makefile b/drivers/gpu/drm/bridge/imx/Makefile
> > index dd5d48584806..8d01fda25451 100644
> > --- a/drivers/gpu/drm/bridge/imx/Makefile
> > +++ b/drivers/gpu/drm/bridge/imx/Makefile
> > @@ -1,6 +1,7 @@
> > obj-$(CONFIG_DRM_IMX_LDB_HELPER) += imx-ldb-helper.o
> > obj-$(CONFIG_DRM_IMX_LEGACY_BRIDGE) += imx-legacy-bridge.o
> > obj-$(CONFIG_DRM_IMX8MP_DW_HDMI_BRIDGE) += imx8mp-hdmi-tx.o
> > +obj-$(CONFIG_DRM_IMX8MP_HDMI_PAI) += imx8mp-hdmi-pai.o
> > obj-$(CONFIG_DRM_IMX8MP_HDMI_PVI) += imx8mp-hdmi-pvi.o
> > obj-$(CONFIG_DRM_IMX8QM_LDB) += imx8qm-ldb.o
> > obj-$(CONFIG_DRM_IMX8QXP_LDB) += imx8qxp-ldb.o
> > diff --git a/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c
> > new file mode 100644
> > index 000000000000..9002974073ca
> > --- /dev/null
> > +++ b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c
> > @@ -0,0 +1,205 @@
> > +// SPDX-License-Identifier: GPL-2.0+
> > +/*
> > + * Copyright 2025 NXP
> > + */
> > +
> > +#include <linux/bitfield.h>
> > +#include <linux/component.h>
> > +#include <linux/module.h>
> > +#include <linux/of_platform.h>
> > +#include <linux/platform_device.h>
> > +#include <drm/bridge/dw_hdmi.h>
> > +#include <sound/asoundef.h>
> > +
> > +#define HTX_PAI_CTRL 0x00
> > +#define ENABLE BIT(0)
> > +
> > +#define HTX_PAI_CTRL_EXT 0x04
> > +#define WTMK_HIGH_MASK GENMASK(31, 24)
> > +#define WTMK_LOW_MASK GENMASK(23, 16)
> > +#define NUM_CH_MASK GENMASK(10, 8)
> > +#define WTMK_HIGH(n) FIELD_PREP(WTMK_HIGH_MASK, (n))
> > +#define WTMK_LOW(n) FIELD_PREP(WTMK_LOW_MASK, (n))
> > +
> > +#define HTX_PAI_FIELD_CTRL 0x08
> > +#define B_FILT BIT(31)
> > +#define PARITY_EN BIT(30)
> > +#define END_SEL BIT(29)
> > +#define PRE_SEL GENMASK(28, 24)
> > +#define D_SEL GENMASK(23, 20)
> > +#define V_SEL GENMASK(19, 15)
> > +#define U_SEL GENMASK(14, 10)
> > +#define C_SEL GENMASK(9, 5)
> > +#define P_SEL GENMASK(4, 0)
> > +
> > +#define HTX_PAI_STAT 0x0c
> > +#define HTX_PAI_IRQ_NOMASK 0x10
> > +#define HTX_PAI_IRQ_MASKED 0x14
> > +#define HTX_PAI_IRQ_MASK 0x18
> > +
> > +struct imx8mp_hdmi_pai {
> > + struct device *dev;
> > + struct regmap *regmap;
> > +};
> > +
> > +static void imx8mp_hdmi_pai_enable(struct dw_hdmi *dw_hdmi, int channel,
> > + int width, int rate, int non_pcm,
> > + int iec958)
> > +{
> > + const struct dw_hdmi_plat_data *pdata = dw_hdmi_to_plat_data(dw_hdmi);
> > + struct imx8mp_hdmi_pai *hdmi_pai = (struct imx8mp_hdmi_pai *)pdata->priv_audio;
> > + int val;
> > +
> > + /* PAI set control extended */
> > + val = WTMK_HIGH(3) | WTMK_LOW(3);
> > + val |= FIELD_PREP(NUM_CH_MASK, channel - 1);
> > + regmap_write(hdmi_pai->regmap, HTX_PAI_CTRL_EXT, val);
> > +
> > + /* IEC60958 format */
> > + if (iec958) {
> > + val = FIELD_PREP_CONST(P_SEL,
> > + __bf_shf(IEC958_SUBFRAME_PARITY));
> > + val |= FIELD_PREP_CONST(C_SEL,
> > + __bf_shf(IEC958_SUBFRAME_CHANNEL_STATUS));
> > + val |= FIELD_PREP_CONST(U_SEL,
> > + __bf_shf(IEC958_SUBFRAME_USER_DATA));
> > + val |= FIELD_PREP_CONST(V_SEL,
> > + __bf_shf(IEC958_SUBFRAME_VALIDITY));
> > + val |= FIELD_PREP_CONST(D_SEL,
> > + __bf_shf(IEC958_SUBFRAME_SAMPLE_24_MASK));
> > + val |= FIELD_PREP_CONST(PRE_SEL,
> > + __bf_shf(IEC958_SUBFRAME_PREAMBLE_MASK));
> > + } else {
> > + /* PCM choose 24bit*/
> > + val = FIELD_PREP(D_SEL, width - 24);
> > + }
> > +
> > + regmap_write(hdmi_pai->regmap, HTX_PAI_FIELD_CTRL, val);
> > +
> > + /* PAI start running */
> > + regmap_write(hdmi_pai->regmap, HTX_PAI_CTRL, ENABLE);
> > +}
> > +
> > +static void imx8mp_hdmi_pai_disable(struct dw_hdmi *dw_hdmi)
> > +{
> > + const struct dw_hdmi_plat_data *pdata = dw_hdmi_to_plat_data(dw_hdmi);
> > + struct imx8mp_hdmi_pai *hdmi_pai = (struct imx8mp_hdmi_pai *)pdata->priv_audio;
> > +
> > + /* Stop PAI */
> > + regmap_write(hdmi_pai->regmap, HTX_PAI_CTRL, 0);
> > +}
> > +
> > +static int imx8mp_hdmi_pai_bind(struct device *dev, struct device *master, void *data)
> > +{
> > + struct dw_hdmi_plat_data *plat_data = (struct dw_hdmi_plat_data *)data;
> > + struct imx8mp_hdmi_pai *hdmi_pai;
> > +
> > + hdmi_pai = dev_get_drvdata(dev);
> > +
> > + plat_data->enable_audio = imx8mp_hdmi_pai_enable;
> > + plat_data->disable_audio = imx8mp_hdmi_pai_disable;
> > + plat_data->priv_audio = hdmi_pai;
> > +
> > + return 0;
> > +}
> > +
> > +static void imx8mp_hdmi_pai_unbind(struct device *dev, struct device *master, void *data)
> > +{
> > + struct dw_hdmi_plat_data *plat_data = (struct dw_hdmi_plat_data *)data;
> > +
> > + plat_data->enable_audio = NULL;
> > + plat_data->disable_audio = NULL;
> > + plat_data->priv_audio = NULL;
> > +}
> > +
> > +static const struct component_ops imx8mp_hdmi_pai_ops = {
> > + .bind = imx8mp_hdmi_pai_bind,
> > + .unbind = imx8mp_hdmi_pai_unbind,
> > +};
> > +
> > +static bool imx8mp_hdmi_pai_volatile_reg(struct device *dev, unsigned int reg)
> > +{
> > + switch (reg) {
> > + case HTX_PAI_IRQ_NOMASK:
> > + case HTX_PAI_IRQ_MASKED:
> > + return true;
> > + default:
> > + return false;
> > + }
> > +}
> > +
> > +static bool imx8mp_hdmi_pai_writeable_reg(struct device *dev, unsigned int reg)
> > +{
> > + switch (reg) {
> > + case HTX_PAI_CTRL:
> > + case HTX_PAI_CTRL_EXT:
> > + case HTX_PAI_FIELD_CTRL:
> > + case HTX_PAI_IRQ_NOMASK:
> > + case HTX_PAI_IRQ_MASKED:
> > + case HTX_PAI_IRQ_MASK:
> > + return true;
> > + default:
> > + return false;
> > + }
> > +}
> > +
> > +static const struct regmap_config imx8mp_hdmi_pai_regmap_config = {
> > + .reg_bits = 32,
> > + .reg_stride = 4,
> > + .val_bits = 32,
> > + .max_register = HTX_PAI_IRQ_MASK,
> > + .volatile_reg = imx8mp_hdmi_pai_volatile_reg,
> > + .writeable_reg = imx8mp_hdmi_pai_writeable_reg,
> > +};
> > +
> > +static int imx8mp_hdmi_pai_probe(struct platform_device *pdev)
> > +{
> > + struct device *dev = &pdev->dev;
> > + struct imx8mp_hdmi_pai *hdmi_pai;
> > + struct resource *res;
> > + void __iomem *base;
> > +
> > + hdmi_pai = devm_kzalloc(dev, sizeof(*hdmi_pai), GFP_KERNEL);
> > + if (!hdmi_pai)
> > + return -ENOMEM;
> > +
> > + base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
> > + if (IS_ERR(base))
> > + return PTR_ERR(base);
> > +
> > + hdmi_pai->dev = dev;
> > +
> > + hdmi_pai->regmap = devm_regmap_init_mmio(dev, base, &imx8mp_hdmi_pai_regmap_config);
> > + if (IS_ERR(hdmi_pai->regmap)) {
> > + dev_err(dev, "regmap init failed\n");
> > + return PTR_ERR(hdmi_pai->regmap);
> > + }
> > +
> > + dev_set_drvdata(dev, hdmi_pai);
> > +
> > + return component_add(dev, &imx8mp_hdmi_pai_ops);
> > +}
> > +
> > +static void imx8mp_hdmi_pai_remove(struct platform_device *pdev)
> > +{
> > + component_del(&pdev->dev, &imx8mp_hdmi_pai_ops);
> > +}
> > +
> > +static const struct of_device_id imx8mp_hdmi_pai_of_table[] = {
> > + { .compatible = "fsl,imx8mp-hdmi-pai" },
> > + { /* Sentinel */ }
> > +};
> > +MODULE_DEVICE_TABLE(of, imx8mp_hdmi_pai_of_table);
> > +
> > +static struct platform_driver imx8mp_hdmi_pai_platform_driver = {
> > + .probe = imx8mp_hdmi_pai_probe,
> > + .remove = imx8mp_hdmi_pai_remove,
> > + .driver = {
> > + .name = "imx8mp-hdmi-pai",
> > + .of_match_table = imx8mp_hdmi_pai_of_table,
> > + },
> > +};
> > +module_platform_driver(imx8mp_hdmi_pai_platform_driver);
> > +
> > +MODULE_DESCRIPTION("i.MX8MP HDMI PAI driver");
> > +MODULE_LICENSE("GPL");
> > diff --git a/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c
> > index 1e7a789ec289..ee08084d2394 100644
> > --- a/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c
> > +++ b/drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c
> > @@ -5,11 +5,13 @@
> > */
> >
> > #include <linux/clk.h>
> > +#include <linux/component.h>
> > #include <linux/mod_devicetable.h>
> > #include <linux/module.h>
> > #include <linux/platform_device.h>
> > #include <drm/bridge/dw_hdmi.h>
> > #include <drm/drm_modes.h>
> > +#include <drm/drm_of.h>
> >
> > struct imx8mp_hdmi {
> > struct dw_hdmi_plat_data plat_data;
> > @@ -79,11 +81,46 @@ static const struct dw_hdmi_phy_ops imx8mp_hdmi_phy_ops = {
> > .update_hpd = dw_hdmi_phy_update_hpd,
> > };
> >
> > +static int imx8mp_dw_hdmi_bind(struct device *dev)
> > +{
> > + struct dw_hdmi_plat_data *plat_data;
> > + struct imx8mp_hdmi *hdmi;
> > + int ret;
> > +
> > + hdmi = dev_get_drvdata(dev);
> > + plat_data = &hdmi->plat_data;
> > +
> > + ret = component_bind_all(dev, plat_data);
>
> Do you really need plat_data variable?
yes, it is used in imx8mp_hdmi_pai_bind()
>
> > + if (ret)
> > + return dev_err_probe(dev, ret, "component_bind_all failed!\n");
> > +
> > + return 0;
> > +}
> > +
> > +static void imx8mp_dw_hdmi_unbind(struct device *dev)
> > +{
> > + struct dw_hdmi_plat_data *plat_data;
> > + struct imx8mp_hdmi *hdmi;
> > +
> > + hdmi = dev_get_drvdata(dev);
> > + plat_data = &hdmi->plat_data;
> > +
> > + component_unbind_all(dev, plat_data);
>
> Do you really need plat_data variable?
yes, it is used by imx8mp_hdmi_pai_unbind()
>
> > +}
> > +
> > +static const struct component_master_ops imx8mp_dw_hdmi_ops = {
> > + .bind = imx8mp_dw_hdmi_bind,
> > + .unbind = imx8mp_dw_hdmi_unbind,
> > +};
> > +
> > static int imx8mp_dw_hdmi_probe(struct platform_device *pdev)
> > {
> > struct device *dev = &pdev->dev;
> > struct dw_hdmi_plat_data *plat_data;
> > + struct component_match *match;
>
> Set match = NULL for drm_of_component_match_add (and subcalls) to allocate memory.
Ok.
best regards
Shengjiu wang.
>
> Best regards
> Alexander
>
> > + struct device_node *remote;
> > struct imx8mp_hdmi *hdmi;
> > + int ret;
> >
> > hdmi = devm_kzalloc(dev, sizeof(*hdmi), GFP_KERNEL);
> > if (!hdmi)
> > @@ -108,6 +145,22 @@ static int imx8mp_dw_hdmi_probe(struct platform_device *pdev)
> >
> > platform_set_drvdata(pdev, hdmi);
> >
> > + /* port@2 is for hdmi_pai device */
> > + remote = of_graph_get_remote_node(pdev->dev.of_node, 2, 0);
> > + if (remote && of_device_is_available(remote)) {
> > + drm_of_component_match_add(dev, &match, component_compare_of, remote);
> > +
> > + of_node_put(remote);
> > +
> > + ret = component_master_add_with_match(dev, &imx8mp_dw_hdmi_ops, match);
> > + if (ret)
> > + dev_warn(dev, "Unable to register aggregate driver\n");
> > + /*
> > + * This audio function is optional for avoid blocking display.
> > + * So just print warning message and no error is returned.
> > + */
> > + }
> > +
> > return 0;
> > }
> >
> > @@ -115,6 +168,8 @@ static void imx8mp_dw_hdmi_remove(struct platform_device *pdev)
> > {
> > struct imx8mp_hdmi *hdmi = platform_get_drvdata(pdev);
> >
> > + component_master_del(&pdev->dev, &imx8mp_dw_hdmi_ops);
> > +
> > dw_hdmi_remove(hdmi->dw_hdmi);
> > }
> >
> > diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h
> > index 095cdd9b7424..336f062e1f9d 100644
> > --- a/include/drm/bridge/dw_hdmi.h
> > +++ b/include/drm/bridge/dw_hdmi.h
> > @@ -143,6 +143,12 @@ struct dw_hdmi_plat_data {
> > const struct drm_display_info *info,
> > const struct drm_display_mode *mode);
> >
> > + /*
> > + * priv_audio is specially used for additional audio device to get
> > + * driver data through this dw_hdmi_plat_data.
> > + */
> > + void *priv_audio;
> > +
> > /* Platform-specific audio enable/disable (optional) */
> > void (*enable_audio)(struct dw_hdmi *hdmi, int channel,
> > int width, int rate, int non_pcm, int iec958);
> >
>
>
> --
> TQ-Systems GmbH | Mühlstraße 2, Gut Delling | 82229 Seefeld, Germany
> Amtsgericht München, HRB 105018
> Geschäftsführer: Detlef Schneider, Rüdiger Stahl, Stefan Schneider
> http://www.tq-group.com/
>
>
© 2016 - 2025 Red Hat, Inc.