Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Lee Shawn C <shawn.c.lee@intel.com>
To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org
Cc: Jani Nikula <jani.nikula@intel.com>,
	Cooper Chiou <cooper.chiou@intel.com>,
	stable@vger.kernel.org
Subject: [Intel-gfx] [v3] drm/edid: check basic audio support on CEA extension block
Date: Thu, 24 Mar 2022 14:12:18 +0800	[thread overview]
Message-ID: <20220324061218.32739-1-shawn.c.lee@intel.com> (raw)
In-Reply-To: <20220321044330.27723-1-cooper.chiou@intel.com>

From: Cooper Chiou <cooper.chiou@intel.com>

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: e28ad544f462 ("drm/edid: parse CEA blocks embedded in DisplayID")
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/drm_edid.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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");
-- 
2.17.1


  parent reply	other threads:[~2022-03-24  5:57 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-21  4:43 [Intel-gfx] [PATCH] drm/edid: filter DisplayID v2.0 CTA block in audio detection Cooper Chiou
2022-03-21  4:59 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2022-03-21  5:39 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-03-21  7:13 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2022-03-21  9:05 ` [Intel-gfx] [PATCH] " Jani Nikula
2022-03-23  5:45 ` [Intel-gfx] [v2] drm/edid: check basic audio support on CEA extension block Lee Shawn C
2022-03-23  9:40   ` Jani Nikula
2022-03-23  5:53 ` [Intel-gfx] ✗ Fi.CI.DOCS: warning for drm/edid: filter DisplayID v2.0 CTA block in audio detection (rev2) Patchwork
2022-03-23  6:20 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-03-23  9:56 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2022-03-23 10:03 ` [Intel-gfx] [PATCH] drm/edid: filter DisplayID v2.0 CTA block in audio detection Jani Nikula
2022-03-23 10:31   ` Lee, Shawn C
2022-03-23 10:40     ` Jani Nikula
2022-03-23 13:35       ` Lee, Shawn C
2022-03-24  6:12 ` Lee Shawn C [this message]
2022-03-24  6:16 ` [Intel-gfx] [v3] drm/edid: check basic audio support on CEA extension block Lee Shawn C
2022-03-24  9:57   ` Jani Nikula
2022-03-24  6:19 ` [Intel-gfx] ✗ Fi.CI.DOCS: warning for drm/edid: filter DisplayID v2.0 CTA block in audio detection (rev4) Patchwork
2022-03-24  6:44 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-03-24  7:55 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220324061218.32739-1-shawn.c.lee@intel.com \
    --to=shawn.c.lee@intel.com \
    --cc=cooper.chiou@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@intel.com \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox