aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCooper Chiou <[email protected]>2022-03-24 14:12:18 +0800
committerJani Nikula <[email protected]>2022-03-24 11:40:15 +0200
commit5662abf6e21338be6d085d6375d3732ac6147fd2 (patch)
tree03dc1dc05cd8e4e4ece7fd2b0a6b4787e8bf47fc
parenta860f266a0e19f271b839451d291a6acf6ddcfe8 (diff)
drm/edid: check basic audio support on CEA extension block
Tag code stored in bit7:5 for CTA block byte[3] is not the same as CEA extension block definition. Only check CEA block has basic audio support. v3: update commit message. Cc: [email protected] Cc: Jani Nikula <[email protected]> Cc: Shawn C Lee <[email protected]> Cc: intel-gfx <[email protected]> Signed-off-by: Cooper Chiou <[email protected]> Signed-off-by: Lee Shawn C <[email protected]> Fixes: e28ad544f462 ("drm/edid: parse CEA blocks embedded in DisplayID") Reviewed-by: Jani Nikula <[email protected]> Signed-off-by: Jani Nikula <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
-rw-r--r--drivers/gpu/drm/drm_edid.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 561f53831e29..f07af6786cec 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -4859,7 +4859,8 @@ bool drm_detect_monitor_audio(struct edid *edid)
if (!edid_ext)
goto end;
- has_audio = ((edid_ext[3] & EDID_BASIC_AUDIO) != 0);
+ has_audio = (edid_ext[0] == CEA_EXT &&
+ (edid_ext[3] & EDID_BASIC_AUDIO) != 0);
if (has_audio) {
DRM_DEBUG_KMS("Monitor has basic audio support\n");