Hi, On Wed, Feb 25, 2026 at 12:30:50PM +0300, Erick Karanja wrote: > Replace calls to the deprecated drm_detect_hdmi_monitor() and > drm_detect_monitor_audio() functions. Calling drm_edid_connector_update() > updates connector->display_info.is_hdmi and connector->display_info.has_audio. > The driver should read these fields from connector->display_info instead of > calling the deprecated functions directly. > > Signed-off-by: Erick Karanja <[email protected]> > --- > drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 17 +++-------------- > 1 file changed, 3 insertions(+), 14 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > index 3b77e73ac0ea..ddc4ae40d94e 100644 > --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > @@ -2472,7 +2472,6 @@ 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; > @@ -2482,19 +2481,9 @@ static const struct drm_edid *dw_hdmi_edid_read(struct > dw_hdmi *hdmi, > 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); > + drm_edid_connector_update(connector, drm_edid); > + hdmi->sink_is_hdmi = connector->display_info.is_hdmi; > + hdmi->sink_has_audio = connector->display_info.has_audio;
You should get rid of sink_is_hdmi and sink_has_audio, and you'll don't need to call any function anymore, deprecated or otherwise. Maxime
signature.asc
Description: PGP signature
