Skip to content

Commit 5662abf

Browse files
Cooper Chioujnikula
authored andcommitted
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: stable@vger.kernel.org Cc: Jani Nikula <jani.nikula@intel.com> Cc: Shawn C Lee <shawn.c.lee@intel.com> Cc: intel-gfx <intel-gfx@lists.freedesktop.org> Signed-off-by: Cooper Chiou <cooper.chiou@intel.com> Signed-off-by: Lee Shawn C <shawn.c.lee@intel.com> Fixes: e28ad54 ("drm/edid: parse CEA blocks embedded in DisplayID") Reviewed-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20220324061218.32739-1-shawn.c.lee@intel.com
1 parent a860f26 commit 5662abf

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

drivers/gpu/drm/drm_edid.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4859,7 +4859,8 @@ bool drm_detect_monitor_audio(struct edid *edid)
48594859
if (!edid_ext)
48604860
goto end;
48614861

4862-
has_audio = ((edid_ext[3] & EDID_BASIC_AUDIO) != 0);
4862+
has_audio = (edid_ext[0] == CEA_EXT &&
4863+
(edid_ext[3] & EDID_BASIC_AUDIO) != 0);
48634864

48644865
if (has_audio) {
48654866
DRM_DEBUG_KMS("Monitor has basic audio support\n");

0 commit comments

Comments
 (0)