Re: [PATCH v3 13/13] drm: bridge: dw_hdmi: Use display_info is_hdmi and has_audio

Nicolas Frattaroli
2026-04-28T12:02:03Z

On Friday, 3 April 2026 20:52:59 Central European Summer Time Jonas Karlman wrote:
> drm_edid_connector_update() is being called from bridge connector funcs
> and from detect and force funcs for dw-hdmi connector.
>
> Change to use is_hdmi and has_audio from display_info directly instead
> of keeping our own state in sink_is_hdmi and sink_has_audio.
>
> Also remove the old and unused edid struct member and related define.
>
> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
> ---
> v3: No change
> v2: Collect r-b tag
> ---
> drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 32 ++++-------------------
> 1 file changed, 5 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> index 5b5654ef6015..fecbc386871d 100644
> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> @@ -44,8 +44,6 @@
> #define DDC_CI_ADDR 0x37
> #define DDC_SEGMENT_ADDR 0x30
>
> -#define HDMI_EDID_LEN 512
> -
> /* DW-HDMI Controller >= 0x200a are at least compliant with SCDC version 1 */
> #define SCDC_MIN_SOURCE_VERSION 0x1
>
> @@ -147,8 +145,6 @@ struct dw_hdmi {
>
> int vic;
>
> - u8 edid[HDMI_EDID_LEN];
> -
> struct {
> const struct dw_hdmi_phy_ops *ops;
> const char *name;
> @@ -158,8 +154,6 @@ struct dw_hdmi {
>
> struct i2c_adapter *ddc;
> void __iomem *regs;
> - bool sink_is_hdmi;
> - bool sink_has_audio;
>
> struct pinctrl *pinctrl;
> struct pinctrl_state *default_state;
> @@ -2057,7 +2051,7 @@ static void hdmi_av_composer(struct dw_hdmi *hdmi,
> HDMI_FC_INVIDCONF_IN_I_P_INTERLACED :
> HDMI_FC_INVIDCONF_IN_I_P_PROGRESSIVE;
>
> - inv_val |= hdmi->sink_is_hdmi ?
> + inv_val |= display->is_hdmi ?
> HDMI_FC_INVIDCONF_DVI_MODEZ_HDMI_MODE :
> HDMI_FC_INVIDCONF_DVI_MODEZ_DVI_MODE;
>
> @@ -2293,7 +2287,7 @@ static int dw_hdmi_poweron(struct dw_hdmi *hdmi,
> if (hdmi->hdmi_data.enc_out_bus_format == MEDIA_BUS_FMT_FIXED)
> hdmi->hdmi_data.enc_out_bus_format = MEDIA_BUS_FMT_RGB888_1X24;
>
> - hdmi->hdmi_data.rgb_limited_range = hdmi->sink_is_hdmi &&
> + hdmi->hdmi_data.rgb_limited_range = display->is_hdmi &&
> drm_default_rgb_quant_range(mode) ==
> HDMI_QUANTIZATION_RANGE_LIMITED;
>
> @@ -2313,7 +2307,7 @@ static int dw_hdmi_poweron(struct dw_hdmi *hdmi,
> /* HDMI Initialization Step B.3 */
> dw_hdmi_enable_video_path(hdmi);
>
> - if (hdmi->sink_has_audio) {
> + if (display->has_audio) {
> dev_dbg(hdmi->dev, "sink has audio support\n");
>
> /* HDMI Initialization Step E - Configure audio */
> @@ -2322,7 +2316,7 @@ static int dw_hdmi_poweron(struct dw_hdmi *hdmi,
> }
>
> /* not for DVI mode */
> - if (hdmi->sink_is_hdmi) {
> + if (display->is_hdmi) {
> dev_dbg(hdmi->dev, "%s HDMI mode\n", __func__);
>
> /* HDMI Initialization Step F - Configure AVI InfoFrame */
> @@ -2436,29 +2430,13 @@ static const struct drm_edid *dw_hdmi_edid_read(struct dw_hdmi *hdmi,
> struct drm_connector *connector)
> {
> const struct drm_edid *drm_edid;
> - const struct edid *edid;
>
> if (!hdmi->ddc)
> return NULL;
>
> drm_edid = drm_edid_read_ddc(connector, hdmi->ddc);
> - if (!drm_edid) {
> + if (!drm_edid)
> dev_dbg(hdmi->dev, "failed to get edid\n");
> - return NULL;
> - }
> -
> - /*
> - * FIXME: This should use connector->display_info.is_hdmi and
> - * connector->display_info.has_audio from a path that has read the EDID
> - * and called drm_edid_connector_update().
> - */
> - edid = drm_edid_raw(drm_edid);
> -
> - dev_dbg(hdmi->dev, "got edid: width[%d] x height[%d]\n",
> - edid->width_cm, edid->height_cm);
> -
> - hdmi->sink_is_hdmi = drm_detect_hdmi_monitor(edid);
> - hdmi->sink_has_audio = drm_detect_monitor_audio(edid);
>
> return drm_edid;
> }
>

Reviewed-by: Nicolas Frattaroli <nicolas.frattaroli@collabora.com>