From patchwork Sun Mar 13 13:46:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lee, Shawn C" X-Patchwork-Id: 12779259 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DA906C433F5 for ; Sun, 13 Mar 2022 13:33:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E076510E0E6; Sun, 13 Mar 2022 13:33:13 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id E143910E059; Sun, 13 Mar 2022 13:33:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1647178392; x=1678714392; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=vKEZg0+EkVYEaMN4aLC1RwqiZW9Cg/uYRPYdTysJ+KI=; b=Z3W+2eESGzcg7M7l1oQZxAKOB9Vsuh2n9A8Qrmpia98kCb6fZMkZv5Zl 0H713es3RURuFgayK0U/tePvdHN1d7SUcgy+Iux9xoagM9dNVG4+YTzN+ hxPrJH1uW2Vyc/bGyBBKYFN7UnAM9x7JfdzcOEhK/iQ+L6X8w8mEPQfOE IK/tIi/tOhX9wxhPMlHbcPLxojM+4N+dGHDtpIxGqB5JgpBiuz9RMRhJl uc699KNvrXrb9JAPuTFNQGonv7j9d0wCjWUfR5vToPVaGbHvJl765kRMX TruDmH2qj+9aVVj5bnwCjTHv4H2RJbR9yXExa8TRQhPDjD7m3j/hp8R8R A==; X-IronPort-AV: E=McAfee;i="6200,9189,10284"; a="255600690" X-IronPort-AV: E=Sophos;i="5.90,178,1643702400"; d="scan'208";a="255600690" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Mar 2022 06:33:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,178,1643702400"; d="scan'208";a="515101465" Received: from shawnle1-build-machine.itwn.intel.com ([10.5.253.78]) by orsmga006.jf.intel.com with ESMTP; 13 Mar 2022 06:33:11 -0700 From: Lee Shawn C To: dri-devel@lists.freedesktop.org Date: Sun, 13 Mar 2022 21:46:58 +0800 Message-Id: <20220313134702.24175-2-shawn.c.lee@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220313134702.24175-1-shawn.c.lee@intel.com> References: <20220313134702.24175-1-shawn.c.lee@intel.com> Subject: [Intel-gfx] [v7 1/5] drm/edid: seek for available CEA and DisplayID block from specific EDID block index X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org, Drew Davenport Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" drm_find_cea_extension() always look for a top level CEA block. Pass ext_index from caller then this function to search next available CEA ext block from a specific EDID block pointer. v2: save proper extension block index if CTA data information was found in DispalyID block. v3: using different parameters to store CEA and DisplayID block index. configure DisplayID extansion block index before search available DisplayID block. Cc: Jani Nikula Cc: Ville Syrjala Cc: Ankit Nautiyal Cc: Drew Davenport Cc: intel-gfx Signed-off-by: Lee Shawn C --- drivers/gpu/drm/drm_displayid.c | 10 +++++-- drivers/gpu/drm/drm_edid.c | 53 ++++++++++++++++++--------------- include/drm/drm_displayid.h | 4 +-- 3 files changed, 39 insertions(+), 28 deletions(-) diff --git a/drivers/gpu/drm/drm_displayid.c b/drivers/gpu/drm/drm_displayid.c index 32da557b960f..31c3e6d7d549 100644 --- a/drivers/gpu/drm/drm_displayid.c +++ b/drivers/gpu/drm/drm_displayid.c @@ -59,11 +59,14 @@ static const u8 *drm_find_displayid_extension(const struct edid *edid, } void displayid_iter_edid_begin(const struct edid *edid, - struct displayid_iter *iter) + struct displayid_iter *iter, int *ext_index) { memset(iter, 0, sizeof(*iter)); iter->edid = edid; + + if (ext_index) + iter->ext_index = *ext_index; } static const struct displayid_block * @@ -126,7 +129,10 @@ __displayid_iter_next(struct displayid_iter *iter) } } -void displayid_iter_end(struct displayid_iter *iter) +void displayid_iter_end(struct displayid_iter *iter, int *ext_index) { + if (ext_index) + *ext_index = iter->ext_index; + memset(iter, 0, sizeof(*iter)); } diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 561f53831e29..78c415aa6889 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -3353,28 +3353,27 @@ const u8 *drm_find_edid_extension(const struct edid *edid, return edid_ext; } -static const u8 *drm_find_cea_extension(const struct edid *edid) +static const u8 *drm_find_cea_extension(const struct edid *edid, + int *cea_ext_index, int *displayid_ext_index) { const struct displayid_block *block; struct displayid_iter iter; const u8 *cea; - int ext_index = 0; - /* Look for a top level CEA extension block */ - /* FIXME: make callers iterate through multiple CEA ext blocks? */ - cea = drm_find_edid_extension(edid, CEA_EXT, &ext_index); + /* Look for a CEA extension block from ext_index */ + cea = drm_find_edid_extension(edid, CEA_EXT, cea_ext_index); if (cea) return cea; /* CEA blocks can also be found embedded in a DisplayID block */ - displayid_iter_edid_begin(edid, &iter); + displayid_iter_edid_begin(edid, &iter, displayid_ext_index); displayid_iter_for_each(block, &iter) { if (block->tag == DATA_BLOCK_CTA) { cea = (const u8 *)block; break; } } - displayid_iter_end(&iter); + displayid_iter_end(&iter, displayid_ext_index); return cea; } @@ -3643,10 +3642,10 @@ add_alternate_cea_modes(struct drm_connector *connector, struct edid *edid) struct drm_device *dev = connector->dev; struct drm_display_mode *mode, *tmp; LIST_HEAD(list); - int modes = 0; + int modes = 0, cea_ext_index = 0, displayid_ext_index = 0; /* Don't add CEA modes if the CEA extension block is missing */ - if (!drm_find_cea_extension(edid)) + if (!drm_find_cea_extension(edid, &cea_ext_index, &displayid_ext_index)) return 0; /* @@ -4321,11 +4320,11 @@ static void drm_parse_y420cmdb_bitmap(struct drm_connector *connector, static int add_cea_modes(struct drm_connector *connector, struct edid *edid) { - const u8 *cea = drm_find_cea_extension(edid); - const u8 *db, *hdmi = NULL, *video = NULL; + const u8 *cea, *db, *hdmi = NULL, *video = NULL; u8 dbl, hdmi_len, video_len = 0; - int modes = 0; + int modes = 0, cea_ext_index = 0, displayid_ext_index = 0; + cea = drm_find_cea_extension(edid, &cea_ext_index, &displayid_ext_index); if (cea && cea_revision(cea) >= 3) { int i, start, end; @@ -4563,6 +4562,7 @@ static void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid) const u8 *cea; const u8 *db; int total_sad_count = 0; + int cea_ext_index = 0, displayid_ext_index = 0; int mnl; int dbl; @@ -4571,7 +4571,7 @@ static void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid) if (!edid) return; - cea = drm_find_cea_extension(edid); + cea = drm_find_cea_extension(edid, &cea_ext_index, &displayid_ext_index); if (!cea) { DRM_DEBUG_KMS("ELD: no CEA Extension found\n"); return; @@ -4657,9 +4657,10 @@ int drm_edid_to_sad(struct edid *edid, struct cea_sad **sads) { int count = 0; int i, start, end, dbl; + int cea_ext_index = 0, displayid_ext_index = 0; const u8 *cea; - cea = drm_find_cea_extension(edid); + cea = drm_find_cea_extension(edid, &cea_ext_index, &displayid_ext_index); if (!cea) { DRM_DEBUG_KMS("SAD: no CEA Extension found\n"); return 0; @@ -4719,9 +4720,10 @@ int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb) { int count = 0; int i, start, end, dbl; + int cea_ext_index = 0, displayid_ext_index = 0; const u8 *cea; - cea = drm_find_cea_extension(edid); + cea = drm_find_cea_extension(edid, &cea_ext_index, &displayid_ext_index); if (!cea) { DRM_DEBUG_KMS("SAD: no CEA Extension found\n"); return 0; @@ -4815,8 +4817,9 @@ bool drm_detect_hdmi_monitor(struct edid *edid) const u8 *edid_ext; int i; int start_offset, end_offset; + int cea_ext_index = 0, displayid_ext_index = 0; - edid_ext = drm_find_cea_extension(edid); + edid_ext = drm_find_cea_extension(edid, &cea_ext_index, &displayid_ext_index); if (!edid_ext) return false; @@ -4854,8 +4857,9 @@ bool drm_detect_monitor_audio(struct edid *edid) int i, j; bool has_audio = false; int start_offset, end_offset; + int cea_ext_index = 0, displayid_ext_index = 0; - edid_ext = drm_find_cea_extension(edid); + edid_ext = drm_find_cea_extension(edid, &cea_ext_index, &displayid_ext_index); if (!edid_ext) goto end; @@ -5178,8 +5182,9 @@ static void drm_parse_cea_ext(struct drm_connector *connector, struct drm_display_info *info = &connector->display_info; const u8 *edid_ext; int i, start, end; + int cea_ext_index = 0, displayid_ext_index = 0; - edid_ext = drm_find_cea_extension(edid); + edid_ext = drm_find_cea_extension(edid, &cea_ext_index, &displayid_ext_index); if (!edid_ext) return; @@ -5311,12 +5316,12 @@ static void drm_update_mso(struct drm_connector *connector, const struct edid *e const struct displayid_block *block; struct displayid_iter iter; - displayid_iter_edid_begin(edid, &iter); + displayid_iter_edid_begin(edid, &iter, NULL); displayid_iter_for_each(block, &iter) { if (block->tag == DATA_BLOCK_2_VENDOR_SPECIFIC) drm_parse_vesa_mso_data(connector, block); } - displayid_iter_end(&iter); + displayid_iter_end(&iter, NULL); } /* A connector has no EDID information, so we've got no EDID to compute quirks from. Reset @@ -5516,13 +5521,13 @@ static int add_displayid_detailed_modes(struct drm_connector *connector, struct displayid_iter iter; int num_modes = 0; - displayid_iter_edid_begin(edid, &iter); + displayid_iter_edid_begin(edid, &iter, NULL); displayid_iter_for_each(block, &iter) { if (block->tag == DATA_BLOCK_TYPE_1_DETAILED_TIMING || block->tag == DATA_BLOCK_2_TYPE_7_DETAILED_TIMING) num_modes += add_displayid_detailed_1_modes(connector, block); } - displayid_iter_end(&iter); + displayid_iter_end(&iter, NULL); return num_modes; } @@ -6164,12 +6169,12 @@ void drm_update_tile_info(struct drm_connector *connector, connector->has_tile = false; - displayid_iter_edid_begin(edid, &iter); + displayid_iter_edid_begin(edid, &iter, NULL); displayid_iter_for_each(block, &iter) { if (block->tag == DATA_BLOCK_TILED_DISPLAY) drm_parse_tiled_block(connector, block); } - displayid_iter_end(&iter); + displayid_iter_end(&iter, NULL); if (!connector->has_tile && connector->tile_group) { drm_mode_put_tile_group(connector->dev, connector->tile_group); diff --git a/include/drm/drm_displayid.h b/include/drm/drm_displayid.h index 7ffbd9f7bfc7..15442a161c11 100644 --- a/include/drm/drm_displayid.h +++ b/include/drm/drm_displayid.h @@ -150,11 +150,11 @@ struct displayid_iter { }; void displayid_iter_edid_begin(const struct edid *edid, - struct displayid_iter *iter); + struct displayid_iter *iter, int *ext_index); const struct displayid_block * __displayid_iter_next(struct displayid_iter *iter); #define displayid_iter_for_each(__block, __iter) \ while (((__block) = __displayid_iter_next(__iter))) -void displayid_iter_end(struct displayid_iter *iter); +void displayid_iter_end(struct displayid_iter *iter, int *ext_index); #endif From patchwork Sun Mar 13 13:46:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lee, Shawn C" X-Patchwork-Id: 12779260 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8B123C433F5 for ; Sun, 13 Mar 2022 13:33:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C58B410E14B; Sun, 13 Mar 2022 13:33:17 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 95FE810E059; Sun, 13 Mar 2022 13:33:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1647178394; x=1678714394; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=QtrMHmhLQqP+pMkwm0xYjvpOXRA6MQSJeB1LfeQgu+M=; b=D20F+Gs2wugq2DYj4XAi0XTTPHQcL5CMcoYnqgwok6DFxD9tRliK2vI+ suNUUHy8Dx2ebtTNKK/LodzDV/lh6HKjBs4uZIpmGqIZXl86ZlJb5q+xy 00fwRg/NhtU2gJGyHmG2s9qLJpJAcjwQhqnZ59iSuQ2P2J85r0wLEbNvx 0+LRwJ2YqDfLkjTyTcpy+lLojXZ5enznkSQBRXhQmEjKxYdW/ouMkYEKt gmz37g0wD9okUIZSe3E0EUbt2LCpFM5C8kPZS0EL4mcMpiHsHuUZSjITI b2njTHlKRctNGVr3Wn2lCyR36SytHU+C0Qg9sT+aU7pL+NF0RAcSxO1Vj g==; X-IronPort-AV: E=McAfee;i="6200,9189,10284"; a="255600693" X-IronPort-AV: E=Sophos;i="5.90,178,1643702400"; d="scan'208";a="255600693" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Mar 2022 06:33:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,178,1643702400"; d="scan'208";a="515101472" Received: from shawnle1-build-machine.itwn.intel.com ([10.5.253.78]) by orsmga006.jf.intel.com with ESMTP; 13 Mar 2022 06:33:12 -0700 From: Lee Shawn C To: dri-devel@lists.freedesktop.org Date: Sun, 13 Mar 2022 21:46:59 +0800 Message-Id: <20220313134702.24175-3-shawn.c.lee@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220313134702.24175-1-shawn.c.lee@intel.com> References: <20220313134702.24175-1-shawn.c.lee@intel.com> Subject: [Intel-gfx] [v7 2/5] drm/edid: parse multiple CEA extension block X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org, Drew Davenport Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Try to find and parse more CEA ext blocks if edid->extensions is greater than one. v2: split prvious patch to two. And do CEA block parsing in this one. v3: simplify this patch based on previous change. v4: refine patch v3. Cc: Jani Nikula Cc: Ville Syrjala Cc: Ankit Nautiyal Cc: Drew Davenport Cc: intel-gfx Signed-off-by: Lee Shawn C --- drivers/gpu/drm/drm_edid.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 78c415aa6889..9fa84881fbba 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -4320,16 +4320,22 @@ static void drm_parse_y420cmdb_bitmap(struct drm_connector *connector, static int add_cea_modes(struct drm_connector *connector, struct edid *edid) { - const u8 *cea, *db, *hdmi = NULL, *video = NULL; - u8 dbl, hdmi_len, video_len = 0; int modes = 0, cea_ext_index = 0, displayid_ext_index = 0; - cea = drm_find_cea_extension(edid, &cea_ext_index, &displayid_ext_index); - if (cea && cea_revision(cea) >= 3) { + for (;;) { + const u8 *cea, *db, *hdmi = NULL, *video = NULL; + u8 dbl, hdmi_len = 0, video_len = 0; int i, start, end; + cea = drm_find_cea_extension(edid, &cea_ext_index, &displayid_ext_index); + if (!cea) + break; + + if (cea_revision(cea) < 3) + continue; + if (cea_db_offsets(cea, &start, &end)) - return 0; + continue; for_each_cea_db(cea, i, start, end) { db = &cea[i]; @@ -4351,15 +4357,15 @@ add_cea_modes(struct drm_connector *connector, struct edid *edid) dbl - 1); } } - } - /* - * We parse the HDMI VSDB after having added the cea modes as we will - * be patching their flags when the sink supports stereo 3D. - */ - if (hdmi) - modes += do_hdmi_vsdb_modes(connector, hdmi, hdmi_len, video, - video_len); + /* + * We parse the HDMI VSDB after having added the cea modes as we will + * be patching their flags when the sink supports stereo 3D. + */ + if (hdmi) + modes += do_hdmi_vsdb_modes(connector, hdmi, hdmi_len, video, + video_len); + } return modes; } From patchwork Sun Mar 13 13:47:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lee, Shawn C" X-Patchwork-Id: 12779261 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 70009C433EF for ; Sun, 13 Mar 2022 13:33:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CF23B10E1E9; Sun, 13 Mar 2022 13:33:18 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 716FD10E14B; Sun, 13 Mar 2022 13:33:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1647178396; x=1678714396; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=c/ws4yhJejbPjZ13n3tQ0t2Mj0WVU4ue70Q94Un0Kvc=; b=Hm72AzvQ4CMd3iFWV3k8DewDAMA5v2UWBvonX+Sd2VdtOQ35RlkIA/Gm f2CvVSDyXLwKaXw60T0/MtjNxUJ6ywu4kujnQv3cfQaATFVMJmRWDSc4E Ij+KtSnw3cdk8k9E5lmOv84ozg0SzqmZV45nvohejjEv8S5slYxdpP8A5 l9FL4Cl3FiC19btF3PfDIx+XyD9OEKZI8Inhg8nWlpROvCP6/K1qxA/mH U4zh+W8w9FMPAc5Jx6S5ZVvB0fl7Ezoh9kderoSIq3RwdQlffhUrigJob izoMJJhoxo+IVbsJZTCJowVf+8stzmfPeoNcimjZnnTr7mBJ7n8oZljLQ A==; X-IronPort-AV: E=McAfee;i="6200,9189,10284"; a="255600695" X-IronPort-AV: E=Sophos;i="5.90,178,1643702400"; d="scan'208";a="255600695" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Mar 2022 06:33:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,178,1643702400"; d="scan'208";a="515101480" Received: from shawnle1-build-machine.itwn.intel.com ([10.5.253.78]) by orsmga006.jf.intel.com with ESMTP; 13 Mar 2022 06:33:14 -0700 From: Lee Shawn C To: dri-devel@lists.freedesktop.org Date: Sun, 13 Mar 2022 21:47:00 +0800 Message-Id: <20220313134702.24175-4-shawn.c.lee@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220313134702.24175-1-shawn.c.lee@intel.com> References: <20220313134702.24175-1-shawn.c.lee@intel.com> Subject: [Intel-gfx] [v7 3/5] drm/edid: read HF-EEODB ext block X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org, Drew Davenport Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" According to HDMI 2.1 spec. "The HDMI Forum EDID Extension Override Data Block (HF-EEODB) is utilized by Sink Devices to provide an alternate method to indicate an EDID Extension Block count larger than 1, while avoiding the need to present a VESA Block Map in the first E-EDID Extension Block." It is a mandatory for HDMI 2.1 protocol compliance as well. This patch help to know how many HF_EEODB blocks report by sink and read allo HF_EEODB blocks back. v2: support to find CEA block, check EEODB block format, and return available block number in drm_edid_read_hf_eeodb_blk_count(). Cc: Jani Nikula Cc: Ville Syrjala Cc: Ankit Nautiyal Cc: Drew Davenport Cc: intel-gfx Signed-off-by: Lee Shawn C --- drivers/gpu/drm/drm_connector.c | 8 +++- drivers/gpu/drm/drm_edid.c | 71 +++++++++++++++++++++++++++++++-- include/drm/drm_edid.h | 1 + 3 files changed, 74 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index a50c82bc2b2f..16011023c12e 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -2129,7 +2129,7 @@ int drm_connector_update_edid_property(struct drm_connector *connector, const struct edid *edid) { struct drm_device *dev = connector->dev; - size_t size = 0; + size_t size = 0, hf_eeodb_blk_count; int ret; const struct edid *old_edid; @@ -2137,8 +2137,12 @@ int drm_connector_update_edid_property(struct drm_connector *connector, if (connector->override_edid) return 0; - if (edid) + if (edid) { size = EDID_LENGTH * (1 + edid->extensions); + hf_eeodb_blk_count = drm_edid_read_hf_eeodb_blk_count(edid); + if (hf_eeodb_blk_count) + size = EDID_LENGTH * (1 + hf_eeodb_blk_count); + } /* Set the display info, using edid if available, otherwise * resetting the values to defaults. This duplicates the work diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 9fa84881fbba..5ae4e83fa5e3 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -1992,6 +1992,7 @@ struct edid *drm_do_get_edid(struct drm_connector *connector, { int i, j = 0, valid_extensions = 0; u8 *edid, *new; + size_t hf_eeodb_blk_count; struct edid *override; override = drm_get_override_edid(connector); @@ -2051,7 +2052,35 @@ struct edid *drm_do_get_edid(struct drm_connector *connector, } kfree(edid); + return (struct edid *)new; + } + + hf_eeodb_blk_count = drm_edid_read_hf_eeodb_blk_count((struct edid *)edid); + if (hf_eeodb_blk_count >= 2) { + new = krealloc(edid, (hf_eeodb_blk_count + 1) * EDID_LENGTH, GFP_KERNEL); + if (!new) + goto out; edid = new; + + valid_extensions = hf_eeodb_blk_count - 1; + for (j = 2; j <= hf_eeodb_blk_count; j++) { + u8 *block = edid + j * EDID_LENGTH; + + for (i = 0; i < 4; i++) { + if (get_edid_block(data, block, j, EDID_LENGTH)) + goto out; + if (drm_edid_block_valid(block, j, false, NULL)) + break; + } + + if (i == 4) + valid_extensions--; + } + + if (valid_extensions != hf_eeodb_blk_count - 1) { + DRM_ERROR("Not able to retrieve proper EDID contain HF-EEODB data.\n"); + goto out; + } } return (struct edid *)edid; @@ -3315,15 +3344,17 @@ add_detailed_modes(struct drm_connector *connector, struct edid *edid, #define VIDEO_BLOCK 0x02 #define VENDOR_BLOCK 0x03 #define SPEAKER_BLOCK 0x04 -#define HDR_STATIC_METADATA_BLOCK 0x6 -#define USE_EXTENDED_TAG 0x07 -#define EXT_VIDEO_CAPABILITY_BLOCK 0x00 +#define EXT_VIDEO_CAPABILITY_BLOCK 0x00 +#define HDR_STATIC_METADATA_BLOCK 0x06 +#define USE_EXTENDED_TAG 0x07 #define EXT_VIDEO_DATA_BLOCK_420 0x0E -#define EXT_VIDEO_CAP_BLOCK_Y420CMDB 0x0F +#define EXT_VIDEO_CAP_BLOCK_Y420CMDB 0x0F +#define EXT_VIDEO_HF_EEODB_DATA_BLOCK 0x78 #define EDID_BASIC_AUDIO (1 << 6) #define EDID_CEA_YCRCB444 (1 << 5) #define EDID_CEA_YCRCB422 (1 << 4) #define EDID_CEA_VCDB_QS (1 << 6) +#define HF_EEODB_LENGTH 2 /* * Search EDID for CEA extension block. @@ -4274,9 +4305,41 @@ static bool cea_db_is_y420vdb(const u8 *db) return true; } +static bool cea_db_is_hdmi_forum_eeodb(const u8 *db) +{ + if (cea_db_tag(db) != USE_EXTENDED_TAG) + return false; + + if (cea_db_payload_len(db) != HF_EEODB_LENGTH) + return false; + + if (cea_db_extended_tag(db) != EXT_VIDEO_HF_EEODB_DATA_BLOCK) + return false; + + return true; +} + #define for_each_cea_db(cea, i, start, end) \ for ((i) = (start); (i) < (end) && (i) + cea_db_payload_len(&(cea)[(i)]) < (end); (i) += cea_db_payload_len(&(cea)[(i)]) + 1) +size_t drm_edid_read_hf_eeodb_blk_count(const struct edid *edid) +{ + const u8 *cea; + int i, start, end, cea_ext_index = 0, displayid_ext_index = 0; + + if (edid->extensions) { + cea = drm_find_cea_extension(edid, &cea_ext_index, &displayid_ext_index); + + if (cea && !cea_db_offsets(cea, &start, &end)) + for_each_cea_db(cea, i, start, end) + if (cea_db_is_hdmi_forum_eeodb(&cea[i])) + return cea[i + 2]; + } + + return 0; +} +EXPORT_SYMBOL_GPL(drm_edid_read_hf_eeodb_blk_count); + static void drm_parse_y420cmdb_bitmap(struct drm_connector *connector, const u8 *db) { diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index 144c495b99c4..585f0ed932d4 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -593,5 +593,6 @@ drm_display_mode_from_cea_vic(struct drm_device *dev, const u8 *drm_find_edid_extension(const struct edid *edid, int ext_id, int *ext_index); +size_t drm_edid_read_hf_eeodb_blk_count(const struct edid *edid); #endif /* __DRM_EDID_H__ */ From patchwork Sun Mar 13 13:47:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lee, Shawn C" X-Patchwork-Id: 12779262 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4FAFDC433F5 for ; Sun, 13 Mar 2022 13:33:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 91C5810E059; Sun, 13 Mar 2022 13:33:19 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5E74410E1B7; Sun, 13 Mar 2022 13:33:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1647178398; x=1678714398; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=fgoTOWqbhDYeNck02jVw8B3hsujgoFe72W50Hl5St3I=; b=PK4VJhfp5xO7qcT1q9M4z7BJaPGrn7fPwUkmIgWHuBGTMVyvaW53rU97 J8X0jzpugIqeN3d9lsRDInfWKTb8Hb+bH4u9fRX0wF/MfUWmTk8sopTjv oCUgaRN5E6lUmLgT+WH7eqsqpopjuDyZhHMmLV4cu5BdlowlWrsilV84G gdC00JJvh6ZMyDBdRUB8KYv1N4be+Z6V+6asye5RD8Jjx+0fp+wKOLren znH9gbviityKo6ovVDiN8CGulVfQLI+ed2MK6qY40m02jz/ki22JFCRGN niOd//dDJKMXdtWfdFG7FQnBg80XStaIVuhWVfBtAPwsZcQN3h4tXOstq w==; X-IronPort-AV: E=McAfee;i="6200,9189,10284"; a="255600698" X-IronPort-AV: E=Sophos;i="5.90,178,1643702400"; d="scan'208";a="255600698" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Mar 2022 06:33:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,178,1643702400"; d="scan'208";a="515101487" Received: from shawnle1-build-machine.itwn.intel.com ([10.5.253.78]) by orsmga006.jf.intel.com with ESMTP; 13 Mar 2022 06:33:16 -0700 From: Lee Shawn C To: dri-devel@lists.freedesktop.org Date: Sun, 13 Mar 2022 21:47:01 +0800 Message-Id: <20220313134702.24175-5-shawn.c.lee@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220313134702.24175-1-shawn.c.lee@intel.com> References: <20220313134702.24175-1-shawn.c.lee@intel.com> Subject: [Intel-gfx] [v7 4/5] drm/edid: parse HF-EEODB CEA extension block X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org, Drew Davenport Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" While adding CEA modes, try to get available EEODB block number. Then based on it to parse numbers of ext blocks, retrieve CEA information and add more CEA modes. Cc: Jani Nikula Cc: Ville Syrjala Cc: Ankit Nautiyal Cc: Drew Davenport Cc: intel-gfx Signed-off-by: Lee Shawn C --- drivers/gpu/drm/drm_displayid.c | 5 ++- drivers/gpu/drm/drm_edid.c | 68 +++++++++++++++++++++++++-------- include/drm/drm_edid.h | 2 +- 3 files changed, 58 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/drm_displayid.c b/drivers/gpu/drm/drm_displayid.c index 31c3e6d7d549..a769c55146f4 100644 --- a/drivers/gpu/drm/drm_displayid.c +++ b/drivers/gpu/drm/drm_displayid.c @@ -37,7 +37,10 @@ static const u8 *drm_find_displayid_extension(const struct edid *edid, int *length, int *idx, int *ext_index) { - const u8 *displayid = drm_find_edid_extension(edid, DISPLAYID_EXT, ext_index); + const u8 *displayid = drm_find_edid_extension(edid, + DISPLAYID_EXT, + ext_index, + edid->extensions); const struct displayid_header *base; int ret; diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 5ae4e83fa5e3..5de85ba20bdf 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -3360,23 +3360,25 @@ add_detailed_modes(struct drm_connector *connector, struct edid *edid, * Search EDID for CEA extension block. */ const u8 *drm_find_edid_extension(const struct edid *edid, - int ext_id, int *ext_index) + int ext_id, + int *ext_index, + int ext_blk_num) { const u8 *edid_ext = NULL; int i; /* No EDID or EDID extensions */ - if (edid == NULL || edid->extensions == 0) + if (edid == NULL || edid->extensions == 0 || *ext_index >= ext_blk_num) return NULL; /* Find CEA extension */ - for (i = *ext_index; i < edid->extensions; i++) { + for (i = *ext_index; i < ext_blk_num; i++) { edid_ext = (const u8 *)edid + EDID_LENGTH * (i + 1); if (edid_ext[0] == ext_id) break; } - if (i >= edid->extensions) + if (i >= ext_blk_num) return NULL; *ext_index = i + 1; @@ -3385,14 +3387,19 @@ const u8 *drm_find_edid_extension(const struct edid *edid, } static const u8 *drm_find_cea_extension(const struct edid *edid, - int *cea_ext_index, int *displayid_ext_index) + int *cea_ext_index, + int *displayid_ext_index, + int ext_blk_num) { const struct displayid_block *block; struct displayid_iter iter; const u8 *cea; /* Look for a CEA extension block from ext_index */ - cea = drm_find_edid_extension(edid, CEA_EXT, cea_ext_index); + cea = drm_find_edid_extension(edid, + CEA_EXT, + cea_ext_index, + ext_blk_num); if (cea) return cea; @@ -3676,7 +3683,10 @@ add_alternate_cea_modes(struct drm_connector *connector, struct edid *edid) int modes = 0, cea_ext_index = 0, displayid_ext_index = 0; /* Don't add CEA modes if the CEA extension block is missing */ - if (!drm_find_cea_extension(edid, &cea_ext_index, &displayid_ext_index)) + if (!drm_find_cea_extension(edid, + &cea_ext_index, + &displayid_ext_index, + edid->extensions)) return 0; /* @@ -4328,7 +4338,10 @@ size_t drm_edid_read_hf_eeodb_blk_count(const struct edid *edid) int i, start, end, cea_ext_index = 0, displayid_ext_index = 0; if (edid->extensions) { - cea = drm_find_cea_extension(edid, &cea_ext_index, &displayid_ext_index); + cea = drm_find_cea_extension(edid, + &cea_ext_index, + &displayid_ext_index, + edid->extensions); if (cea && !cea_db_offsets(cea, &start, &end)) for_each_cea_db(cea, i, start, end) @@ -4384,13 +4397,20 @@ static int add_cea_modes(struct drm_connector *connector, struct edid *edid) { int modes = 0, cea_ext_index = 0, displayid_ext_index = 0; + int ext_blk_num = drm_edid_read_hf_eeodb_blk_count(edid); + + if (!ext_blk_num) + ext_blk_num = edid->extensions; for (;;) { const u8 *cea, *db, *hdmi = NULL, *video = NULL; u8 dbl, hdmi_len = 0, video_len = 0; int i, start, end; - cea = drm_find_cea_extension(edid, &cea_ext_index, &displayid_ext_index); + cea = drm_find_cea_extension(edid, + &cea_ext_index, + &displayid_ext_index, + ext_blk_num); if (!cea) break; @@ -4640,7 +4660,10 @@ static void drm_edid_to_eld(struct drm_connector *connector, struct edid *edid) if (!edid) return; - cea = drm_find_cea_extension(edid, &cea_ext_index, &displayid_ext_index); + cea = drm_find_cea_extension(edid, + &cea_ext_index, + &displayid_ext_index, + edid->extensions); if (!cea) { DRM_DEBUG_KMS("ELD: no CEA Extension found\n"); return; @@ -4729,7 +4752,10 @@ int drm_edid_to_sad(struct edid *edid, struct cea_sad **sads) int cea_ext_index = 0, displayid_ext_index = 0; const u8 *cea; - cea = drm_find_cea_extension(edid, &cea_ext_index, &displayid_ext_index); + cea = drm_find_cea_extension(edid, + &cea_ext_index, + &displayid_ext_index, + edid->extensions); if (!cea) { DRM_DEBUG_KMS("SAD: no CEA Extension found\n"); return 0; @@ -4792,7 +4818,10 @@ int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb) int cea_ext_index = 0, displayid_ext_index = 0; const u8 *cea; - cea = drm_find_cea_extension(edid, &cea_ext_index, &displayid_ext_index); + cea = drm_find_cea_extension(edid, + &cea_ext_index, + &displayid_ext_index, + edid->extensions); if (!cea) { DRM_DEBUG_KMS("SAD: no CEA Extension found\n"); return 0; @@ -4888,7 +4917,10 @@ bool drm_detect_hdmi_monitor(struct edid *edid) int start_offset, end_offset; int cea_ext_index = 0, displayid_ext_index = 0; - edid_ext = drm_find_cea_extension(edid, &cea_ext_index, &displayid_ext_index); + edid_ext = drm_find_cea_extension(edid, + &cea_ext_index, + &displayid_ext_index, + edid->extensions); if (!edid_ext) return false; @@ -4928,7 +4960,10 @@ bool drm_detect_monitor_audio(struct edid *edid) int start_offset, end_offset; int cea_ext_index = 0, displayid_ext_index = 0; - edid_ext = drm_find_cea_extension(edid, &cea_ext_index, &displayid_ext_index); + edid_ext = drm_find_cea_extension(edid, + &cea_ext_index, + &displayid_ext_index, + edid->extensions); if (!edid_ext) goto end; @@ -5253,7 +5288,10 @@ static void drm_parse_cea_ext(struct drm_connector *connector, int i, start, end; int cea_ext_index = 0, displayid_ext_index = 0; - edid_ext = drm_find_cea_extension(edid, &cea_ext_index, &displayid_ext_index); + edid_ext = drm_find_cea_extension(edid, + &cea_ext_index, + &displayid_ext_index, + edid->extensions); if (!edid_ext) return; diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index 585f0ed932d4..fa06f9a468c4 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -591,7 +591,7 @@ struct drm_display_mode * drm_display_mode_from_cea_vic(struct drm_device *dev, u8 video_code); const u8 *drm_find_edid_extension(const struct edid *edid, - int ext_id, int *ext_index); + int ext_id, int *ext_index, int ext_blk_num); size_t drm_edid_read_hf_eeodb_blk_count(const struct edid *edid); From patchwork Sun Mar 13 13:47:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lee, Shawn C" X-Patchwork-Id: 12779263 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 75C36C433F5 for ; Sun, 13 Mar 2022 13:33:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5E3F610E1B7; Sun, 13 Mar 2022 13:33:24 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3D53510E1B7; Sun, 13 Mar 2022 13:33:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1647178400; x=1678714400; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=KvMI83gqySb7VlbWAXFc/Dxw353ibpKGtC6Vg3lxMew=; b=SxH461XJQSp2PuBZimX4eIlQS7KyxAvvLcoaK/n41giLgZdDfrVQOxL/ l7jOCqE3AfMmC6s1F7SiOTjUui93Ol5YvCFvcsaaPvhymSWyB2GeGnMrA ToYzTYVe6BS0/AbDEqk3SrTFXVFnPySKrE0COsgmAk1XoTN4/IhmXQnCf kJ88uDy4D1Y901C80x6W+DRYWw3mpXVuRDZBmi7FNP/HbHeW6mgKFtqfw C9IE+jL5PKhLKku8j/1RecEpxrX22Oe/RtWAtgJFM35zCAV387uTGE2oj LZ8YWJqDNDIQpVKoHzsxfUYEhac2Ixmqvv9za49AvTP4zV0KR95bmLz4M w==; X-IronPort-AV: E=McAfee;i="6200,9189,10284"; a="255600702" X-IronPort-AV: E=Sophos;i="5.90,178,1643702400"; d="scan'208";a="255600702" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Mar 2022 06:33:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,178,1643702400"; d="scan'208";a="515101490" Received: from shawnle1-build-machine.itwn.intel.com ([10.5.253.78]) by orsmga006.jf.intel.com with ESMTP; 13 Mar 2022 06:33:18 -0700 From: Lee Shawn C To: dri-devel@lists.freedesktop.org Date: Sun, 13 Mar 2022 21:47:02 +0800 Message-Id: <20220313134702.24175-6-shawn.c.lee@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220313134702.24175-1-shawn.c.lee@intel.com> References: <20220313134702.24175-1-shawn.c.lee@intel.com> Subject: [Intel-gfx] [v7 5/5] drm/edid: check for HF-SCDB block X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org, Drew Davenport Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Find HF-SCDB information in CEA extensions block. And retrieve Max_TMDS_Character_Rate that support by sink device. v2: HF-SCDB and HF-VSDBS carry the same SCDS data. Reuse drm_parse_hdmi_forum_vsdb() to parse this packet. Cc: Jani Nikula Cc: Ville Syrjala Cc: Ankit Nautiyal Cc: Drew Davenport Cc: intel-gfx Signed-off-by: Lee Shawn C --- drivers/gpu/drm/drm_edid.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 5de85ba20bdf..351a729bddb6 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -3350,6 +3350,7 @@ add_detailed_modes(struct drm_connector *connector, struct edid *edid, #define EXT_VIDEO_DATA_BLOCK_420 0x0E #define EXT_VIDEO_CAP_BLOCK_Y420CMDB 0x0F #define EXT_VIDEO_HF_EEODB_DATA_BLOCK 0x78 +#define EXT_VIDEO_HF_SCDB_DATA_BLOCK 0x79 #define EDID_BASIC_AUDIO (1 << 6) #define EDID_CEA_YCRCB444 (1 << 5) #define EDID_CEA_YCRCB422 (1 << 4) @@ -4287,6 +4288,20 @@ static bool cea_db_is_vcdb(const u8 *db) return true; } +static bool cea_db_is_hdmi_forum_scdb(const u8 *db) +{ + if (cea_db_tag(db) != USE_EXTENDED_TAG) + return false; + + if (cea_db_payload_len(db) < 7) + return false; + + if (cea_db_extended_tag(db) != EXT_VIDEO_HF_SCDB_DATA_BLOCK) + return false; + + return true; +} + static bool cea_db_is_y420cmdb(const u8 *db) { if (cea_db_tag(db) != USE_EXTENDED_TAG) @@ -5312,7 +5327,8 @@ static void drm_parse_cea_ext(struct drm_connector *connector, if (cea_db_is_hdmi_vsdb(db)) drm_parse_hdmi_vsdb_video(connector, db); - if (cea_db_is_hdmi_forum_vsdb(db)) + if (cea_db_is_hdmi_forum_vsdb(db) || + cea_db_is_hdmi_forum_scdb(db)) drm_parse_hdmi_forum_vsdb(connector, db); if (cea_db_is_microsoft_vsdb(db)) drm_parse_microsoft_vsdb(connector, db);