drm/bridge: adv7511: provide SPD and HDMI infoframes

ADV75xx hardware supports sending SPD InfoFrame over the HDMI link. Also
it provides support for two generic (Spare) InfoFrames. Use those
capabilities to be able to send SPD and HDMI Vendor-Specific Infoframes.

Reviewed-by: Maxime Ripard <mripard@kernel.org>
Link: https://lore.kernel.org/r/20250827-adv7511-infoframes-v1-1-f89b9690f89c@oss.qualcomm.com
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>

diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511.h b/drivers/gpu/drm/bridge/adv7511/adv7511.h
index 85ebead9809cfe4142fb0e2586f8904227acb096..8be7266fd4f49fbc4ccf9ee12c302b3a6d74a6e0 100644 (file)
--- a/drivers/gpu/drm/bridge/adv7511/adv7511.h
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511.h
@@ -195,13 +195,14 @@
 #define ADV7511_I2S_IEC958_DIRECT              3
 
 #define ADV7511_PACKET(p, x)       ((p) * 0x20 + (x))
-#define ADV7511_PACKET_SDP(x)      ADV7511_PACKET(0, x)
+#define ADV7511_PACKET_SPD(x)      ADV7511_PACKET(0, x)
 #define ADV7511_PACKET_MPEG(x)     ADV7511_PACKET(1, x)
 #define ADV7511_PACKET_ACP(x)      ADV7511_PACKET(2, x)
 #define ADV7511_PACKET_ISRC1(x)            ADV7511_PACKET(3, x)
 #define ADV7511_PACKET_ISRC2(x)            ADV7511_PACKET(4, x)
 #define ADV7511_PACKET_GM(x)       ADV7511_PACKET(5, x)
-#define ADV7511_PACKET_SPARE(x)            ADV7511_PACKET(6, x)
+#define ADV7511_PACKET_SPARE1(x)    ADV7511_PACKET(6, x)
+#define ADV7511_PACKET_SPARE2(x)    ADV7511_PACKET(7, x)
 
 #define ADV7511_REG_CEC_TX_FRAME_HDR   0x00
 #define ADV7511_REG_CEC_TX_FRAME_DATA0 0x01
@@ -348,6 +349,7 @@ struct adv7511 {
        struct i2c_client *i2c_cec;
 
        struct regmap *regmap;
+       struct regmap *regmap_packet;
        struct regmap *regmap_cec;
        enum drm_connector_status status;
        bool powered;

diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
index 00d6417c177b430cb1a81118800588b90c692018..26f8ef4824235a9a85b57a9a3a816fe26a59e45c 100644 (file)
--- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
@@ -132,6 +132,13 @@ static const struct regmap_config adv7511_regmap_config = {
        .volatile_reg = adv7511_register_volatile,
 };
 
+static const struct regmap_config adv7511_packet_config = {
+       .reg_bits = 8,
+       .val_bits = 8,
+
+       .max_register = 0xff,
+};
+
 /* -----------------------------------------------------------------------------
  * Hardware configuration
  */
@@ -889,6 +896,12 @@ static int adv7511_bridge_hdmi_clear_infoframe(struct drm_bridge *bridge,
        case HDMI_INFOFRAME_TYPE_AVI:
                adv7511_packet_disable(adv7511, ADV7511_PACKET_ENABLE_AVI_INFOFRAME);
                break;
+       case HDMI_INFOFRAME_TYPE_SPD:
+               adv7511_packet_disable(adv7511, ADV7511_PACKET_ENABLE_SPD);
+               break;
+       case HDMI_INFOFRAME_TYPE_VENDOR:
+               adv7511_packet_disable(adv7511, ADV7511_PACKET_ENABLE_SPARE1);
+               break;
        default:
                drm_dbg_driver(adv7511->bridge.dev, "Unsupported HDMI InfoFrame %x\n", type);
                break;
@@ -913,6 +926,16 @@ static int adv7511_bridge_hdmi_write_infoframe(struct drm_bridge *bridge,
 
                adv7511_packet_enable(adv7511, ADV7511_PACKET_ENABLE_AVI_INFOFRAME);
                break;
+       case HDMI_INFOFRAME_TYPE_SPD:
+               regmap_bulk_write(adv7511->regmap_packet, ADV7511_PACKET_SPD(0),
+                                 buffer, len);
+               adv7511_packet_enable(adv7511, ADV7511_PACKET_ENABLE_SPD);
+               break;
+       case HDMI_INFOFRAME_TYPE_VENDOR:
+               regmap_bulk_write(adv7511->regmap_packet, ADV7511_PACKET_SPARE1(0),
+                                 buffer, len);
+               adv7511_packet_enable(adv7511, ADV7511_PACKET_ENABLE_SPARE1);
+               break;
        default:
                drm_dbg_driver(adv7511->bridge.dev, "Unsupported HDMI InfoFrame %x\n", type);
                break;
@@ -1242,6 +1265,13 @@ static int adv7511_probe(struct i2c_client *i2c)
                goto err_i2c_unregister_edid;
        }
 
+       adv7511->regmap_packet = devm_regmap_init_i2c(adv7511->i2c_packet,
+                                                     &adv7511_packet_config);
+       if (IS_ERR(adv7511->regmap_packet)) {
+               ret = PTR_ERR(adv7511->regmap_packet);
+               goto err_i2c_unregister_packet;
+       }
+
        regmap_write(adv7511->regmap, ADV7511_REG_PACKET_I2C_ADDR,
                     adv7511->i2c_packet->addr << 1);