Skip to content

Commit 0374ffa

Browse files
committed
drm/edid: parse display info has_audio similar to is_hdmi
Since we already iterate everything that's needed for determining audio, reduce the need to call drm_detect_monitor_audio() by storing has_audio to connector info. Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com> Acked-by: Thomas Zimmermann <tzimmermann@suse.de> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/391a93b25c6bcbb39854aaa2813570cfb1580ed9.1685437500.git.jani.nikula@intel.com
1 parent 88e9664 commit 0374ffa

2 files changed

Lines changed: 14 additions & 0 deletions

File tree

drivers/gpu/drm/drm_edid.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6243,6 +6243,9 @@ static void drm_parse_cea_ext(struct drm_connector *connector,
62436243
info->color_formats |= DRM_COLOR_FORMAT_YCBCR444;
62446244
if (edid_ext[3] & EDID_CEA_YCRCB422)
62456245
info->color_formats |= DRM_COLOR_FORMAT_YCBCR422;
6246+
if (edid_ext[3] & EDID_BASIC_AUDIO)
6247+
info->has_audio = true;
6248+
62466249
}
62476250
drm_edid_iter_end(&edid_iter);
62486251

@@ -6268,6 +6271,8 @@ static void drm_parse_cea_ext(struct drm_connector *connector,
62686271
drm_parse_hdr_metadata_block(connector, data);
62696272
else if (cea_db_tag(db) == CTA_DB_VIDEO)
62706273
parse_cta_vdb(connector, db);
6274+
else if (cea_db_tag(db) == CTA_DB_AUDIO)
6275+
info->has_audio = true;
62716276
}
62726277
cea_db_iter_end(&iter);
62736278

@@ -6424,6 +6429,7 @@ static void drm_reset_display_info(struct drm_connector *connector)
64246429
info->max_tmds_clock = 0;
64256430
info->dvi_dual = false;
64266431
info->is_hdmi = false;
6432+
info->has_audio = false;
64276433
info->has_hdmi_infoframe = false;
64286434
info->rgb_quant_range_selectable = false;
64296435
memset(&info->hdmi, 0, sizeof(info->hdmi));

include/drm/drm_connector.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -658,6 +658,14 @@ struct drm_display_info {
658658
*/
659659
bool is_hdmi;
660660

661+
/**
662+
* @has_audio: True if the sink supports audio.
663+
*
664+
* This field shall be used instead of calling
665+
* drm_detect_monitor_audio() when possible.
666+
*/
667+
bool has_audio;
668+
661669
/**
662670
* @has_hdmi_infoframe: Does the sink support the HDMI infoframe?
663671
*/

0 commit comments

Comments
 (0)