drm/bridge: dw-hdmi-qp: Provide SPD InfoFrame

The hardware is capable of sending Source Product Description (SPD)
InfoFrames, hence enable the missing support.

Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Reviewed-by: Maxime Ripard <mripard@kernel.org>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Link: https://patch.msgid.link/20260129-dw-hdmi-qp-iframe-v2-2-0157ad05232c@collabora.com
Signed-off-by: Daniel Stone <daniels@collabora.com>

diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c
index 93aae1d8027dcfa0825b3f3a8c14573aba1ff216..c006939a0f87edf8e3486e6bbbba820f8368c501 100644 (file)
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c
@@ -986,6 +986,15 @@ static int dw_hdmi_qp_bridge_clear_hdr_drm_infoframe(struct drm_bridge *bridge)
        return 0;
 }
 
+static int dw_hdmi_qp_bridge_clear_spd_infoframe(struct drm_bridge *bridge)
+{
+       struct dw_hdmi_qp *hdmi = bridge->driver_private;
+
+       dw_hdmi_qp_mod(hdmi, 0, PKTSCHED_SPDI_TX_EN, PKTSCHED_PKT_EN);
+
+       return 0;
+}
+
 static int dw_hdmi_qp_bridge_clear_audio_infoframe(struct drm_bridge *bridge)
 {
        struct dw_hdmi_qp *hdmi = bridge->driver_private;
@@ -1061,6 +1070,21 @@ static int dw_hdmi_qp_bridge_write_hdr_drm_infoframe(struct drm_bridge *bridge,
        return dw_hdmi_qp_config_drm_infoframe(hdmi, buffer, len);
 }
 
+static int dw_hdmi_qp_bridge_write_spd_infoframe(struct drm_bridge *bridge,
+                                                const u8 *buffer, size_t len)
+{
+       struct dw_hdmi_qp *hdmi = bridge->driver_private;
+
+       dw_hdmi_qp_bridge_clear_spd_infoframe(bridge);
+
+       dw_hdmi_qp_write_infoframe(hdmi, buffer, len, PKT_SPDI_CONTENTS0);
+
+       dw_hdmi_qp_mod(hdmi, PKTSCHED_SPDI_TX_EN, PKTSCHED_SPDI_TX_EN,
+                      PKTSCHED_PKT_EN);
+
+       return 0;
+}
+
 static int dw_hdmi_qp_bridge_write_audio_infoframe(struct drm_bridge *bridge,
                                                   const u8 *buffer, size_t len)
 {
@@ -1259,6 +1283,8 @@ static const struct drm_bridge_funcs dw_hdmi_qp_bridge_funcs = {
        .hdmi_write_hdmi_infoframe = dw_hdmi_qp_bridge_write_hdmi_infoframe,
        .hdmi_clear_hdr_drm_infoframe = dw_hdmi_qp_bridge_clear_hdr_drm_infoframe,
        .hdmi_write_hdr_drm_infoframe = dw_hdmi_qp_bridge_write_hdr_drm_infoframe,
+       .hdmi_clear_spd_infoframe = dw_hdmi_qp_bridge_clear_spd_infoframe,
+       .hdmi_write_spd_infoframe = dw_hdmi_qp_bridge_write_spd_infoframe,
        .hdmi_clear_audio_infoframe = dw_hdmi_qp_bridge_clear_audio_infoframe,
        .hdmi_write_audio_infoframe = dw_hdmi_qp_bridge_write_audio_infoframe,
        .hdmi_audio_startup = dw_hdmi_qp_audio_enable,
@@ -1375,7 +1401,8 @@ struct dw_hdmi_qp *dw_hdmi_qp_bind(struct platform_device *pdev,
                           DRM_BRIDGE_OP_EDID |
                           DRM_BRIDGE_OP_HDMI |
                           DRM_BRIDGE_OP_HDMI_AUDIO |
-                          DRM_BRIDGE_OP_HDMI_HDR_DRM_INFOFRAME;
+                          DRM_BRIDGE_OP_HDMI_HDR_DRM_INFOFRAME |
+                          DRM_BRIDGE_OP_HDMI_SPD_INFOFRAME;
        if (!hdmi->no_hpd)
                hdmi->bridge.ops |= DRM_BRIDGE_OP_HPD;
        hdmi->bridge.of_node = pdev->dev.of_node;

diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h
index 53688eae8dba6a23410bcdfe4cef046594fc6b9b..c07847e8d7dd094cad94e89ac110515186c6d54f 100644 (file)
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h
@@ -206,6 +206,7 @@
 #define PKTSCHED_PKT_EN                                        0xaa8
 #define PKTSCHED_DRMI_TX_EN                            BIT(17)
 #define PKTSCHED_AUDI_TX_EN                            BIT(15)
+#define PKTSCHED_SPDI_TX_EN                            BIT(14)
 #define PKTSCHED_AVI_TX_EN                             BIT(13)
 #define PKTSCHED_VSI_TX_EN                             BIT(12)
 #define PKTSCHED_EMP_CVTEM_TX_EN                       BIT(10)