Hi Nicolas, On 2/16/26 3:01 PM, Nicolas Frattaroli wrote: > The atomic_get_output_bus_fmts callback is used by the DRM bridge layer > to recursively select a suitable output format in a bridge chain. > > As a bridge that outputs to HDMI, dw-hdmi-qp will have its output > formats determined by which formats the platform-specific integration of > the hardware supports, and the chosen HDMI output bit depth. > > Implement this callback. The returned u32* buffer is supposed to be > freed by the caller of this callback, as specified by the callback's > documentation. > > Signed-off-by: Nicolas Frattaroli <[email protected]> > --- > drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 178 > +++++++++++++++++++++++++++ > 1 file changed, 178 insertions(+) > > diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c > b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c > index d649a1cf07f5..4c00218e5fd7 100644 > --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c > +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c > @@ -11,6 +11,7 @@ > #include <linux/export.h> > #include <linux/i2c.h> > #include <linux/irq.h> > +#include <linux/media-bus-format.h> > #include <linux/minmax.h> > #include <linux/module.h> > #include <linux/mutex.h> > @@ -749,6 +750,182 @@ static struct i2c_adapter > *dw_hdmi_qp_i2c_adapter(struct dw_hdmi_qp *hdmi) > return adap; > } > > +static int dw_hdmi_qp_config_avi_infoframe(struct dw_hdmi_qp *hdmi, > + const u8 *buffer, size_t len) > +{ > + u32 val, i, j; > + > + if (len != HDMI_INFOFRAME_SIZE(AVI)) { > + dev_err(hdmi->dev, "failed to configure avi infoframe\n"); > + return -EINVAL; > + } > + > + /* > + * DW HDMI QP IP uses a different byte format from standard AVI info > + * frames, though generally the bits are in the correct bytes. > + */ > + val = buffer[1] << 8 | buffer[2] << 16; > + dw_hdmi_qp_write(hdmi, val, PKT_AVI_CONTENTS0); > + > + for (i = 0; i < 4; i++) { > + for (j = 0; j < 4; j++) { > + if (i * 4 + j >= 14) > + break; > + if (!j) > + val = buffer[i * 4 + j + 3]; > + val |= buffer[i * 4 + j + 3] << (8 * j); > + } > + > + dw_hdmi_qp_write(hdmi, val, PKT_AVI_CONTENTS1 + i * 4); > + } > + > + dw_hdmi_qp_mod(hdmi, 0, PKTSCHED_AVI_FIELDRATE, PKTSCHED_PKT_CONFIG1); > + > + dw_hdmi_qp_mod(hdmi, PKTSCHED_AVI_TX_EN | PKTSCHED_GCP_TX_EN, > + PKTSCHED_AVI_TX_EN | PKTSCHED_GCP_TX_EN, > PKTSCHED_PKT_EN); > + > + return 0; > +} > + > +static int dw_hdmi_qp_config_drm_infoframe(struct dw_hdmi_qp *hdmi, > + const u8 *buffer, size_t len) > +{ > + u32 val, i; > + > + if (len != HDMI_INFOFRAME_SIZE(DRM)) { > + dev_err(hdmi->dev, "failed to configure drm infoframe\n"); > + return -EINVAL; > + } > + > + dw_hdmi_qp_mod(hdmi, 0, PKTSCHED_DRMI_TX_EN, PKTSCHED_PKT_EN); > + > + val = buffer[1] << 8 | buffer[2] << 16; > + dw_hdmi_qp_write(hdmi, val, PKT_DRMI_CONTENTS0); > + > + for (i = 0; i <= buffer[2]; i++) { > + if (i % 4 == 0) > + val = buffer[3 + i]; > + val |= buffer[3 + i] << ((i % 4) * 8); > + > + if ((i % 4 == 3) || i == buffer[2]) > + dw_hdmi_qp_write(hdmi, val, > + PKT_DRMI_CONTENTS1 + ((i / 4) * 4)); > + } > + > + dw_hdmi_qp_mod(hdmi, 0, PKTSCHED_DRMI_FIELDRATE, PKTSCHED_PKT_CONFIG1); > + dw_hdmi_qp_mod(hdmi, PKTSCHED_DRMI_TX_EN, PKTSCHED_DRMI_TX_EN, > + PKTSCHED_PKT_EN); > + > + return 0; > +} > + > +/* > + * Static values documented in the TRM > + * Different values are only used for debug purposes > + */ > +#define DW_HDMI_QP_AUDIO_INFOFRAME_HB1 0x1 > +#define DW_HDMI_QP_AUDIO_INFOFRAME_HB2 0xa > + > +static int dw_hdmi_qp_config_audio_infoframe(struct dw_hdmi_qp *hdmi, > + const u8 *buffer, size_t len) > +{ > + /* > + * AUDI_CONTENTS0: { RSV, HB2, HB1, RSV } > + * AUDI_CONTENTS1: { PB3, PB2, PB1, PB0 } > + * AUDI_CONTENTS2: { PB7, PB6, PB5, PB4 } > + * > + * PB0: CheckSum > + * PB1: | CT3 | CT2 | CT1 | CT0 | F13 | CC2 | CC1 | CC0 | > + * PB2: | F27 | F26 | F25 | SF2 | SF1 | SF0 | SS1 | SS0 | > + * PB3: | F37 | F36 | F35 | F34 | F33 | F32 | F31 | F30 | > + * PB4: | CA7 | CA6 | CA5 | CA4 | CA3 | CA2 | CA1 | CA0 | > + * PB5: | DM_INH | LSV3 | LSV2 | LSV1 | LSV0 | F52 | F51 | F50 | > + * PB6~PB10: Reserved > + * > + * AUDI_CONTENTS0 default value defined by HDMI specification, > + * and shall only be changed for debug purposes. > + */ > + u32 header_bytes = (DW_HDMI_QP_AUDIO_INFOFRAME_HB1 << 8) | > + (DW_HDMI_QP_AUDIO_INFOFRAME_HB2 << 16); > + > + regmap_bulk_write(hdmi->regm, PKT_AUDI_CONTENTS0, &header_bytes, 1); > + regmap_bulk_write(hdmi->regm, PKT_AUDI_CONTENTS1, &buffer[3], 1); > + regmap_bulk_write(hdmi->regm, PKT_AUDI_CONTENTS2, &buffer[4], 1); > + > + /* Enable ACR, AUDI, AMD */ > + dw_hdmi_qp_mod(hdmi, > + PKTSCHED_ACR_TX_EN | PKTSCHED_AUDI_TX_EN | > PKTSCHED_AMD_TX_EN, > + PKTSCHED_ACR_TX_EN | PKTSCHED_AUDI_TX_EN | > PKTSCHED_AMD_TX_EN, > + PKTSCHED_PKT_EN); > + > + /* Enable AUDS */ > + dw_hdmi_qp_mod(hdmi, PKTSCHED_AUDS_TX_EN, PKTSCHED_AUDS_TX_EN, > PKTSCHED_PKT_EN); > + > + return 0; > +}
Something's wrong with this patch as all the functions above have been dropped since the HDMI VSI & SPD InfoFrames series [1] got merged. The previous revision was fine though, hence that's likely an unexpected artifact of the latest rebase. [1] https://lore.kernel.org/all/[email protected]/
