All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@intel.com>
To: dri-devel@lists.freedesktop.org
Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org
Subject: [PATCH v7 08/22] drm/edid: split CTA Y420VDB info and mode parsing
Date: Wed,  4 Jan 2023 12:05:23 +0200	[thread overview]
Message-ID: <3bc5fe6650a6ce4249803f7192096764ea724e05.1672826282.git.jani.nikula@intel.com> (raw)
In-Reply-To: <cover.1672826282.git.jani.nikula@intel.com>

Separate the parsing of display info and modes from the CTA
Y420VDB. This is prerequisite work for overall better separation of the
two parsing steps.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/drm_edid.c | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index ead7a4ce0422..076ba125c38d 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -4497,10 +4497,8 @@ drm_display_mode_from_vic_index(struct drm_connector *connector, int vic_index)
 static int do_y420vdb_modes(struct drm_connector *connector,
 			    const u8 *svds, u8 svds_len)
 {
-	int modes = 0, i;
 	struct drm_device *dev = connector->dev;
-	struct drm_display_info *info = &connector->display_info;
-	struct drm_hdmi_info *hdmi = &info->hdmi;
+	int modes = 0, i;
 
 	for (i = 0; i < svds_len; i++) {
 		u8 vic = svd_to_vic(svds[i]);
@@ -4512,13 +4510,10 @@ static int do_y420vdb_modes(struct drm_connector *connector,
 		newmode = drm_mode_duplicate(dev, cea_mode_for_vic(vic));
 		if (!newmode)
 			break;
-		bitmap_set(hdmi->y420_vdb_modes, vic, 1);
 		drm_mode_probed_add(connector, newmode);
 		modes++;
 	}
 
-	if (modes > 0)
-		info->color_formats |= DRM_COLOR_FORMAT_YCBCR420;
 	return modes;
 }
 
@@ -5876,6 +5871,26 @@ static bool cta_vdb_has_vic(const struct drm_connector *connector, u8 vic)
 	return false;
 }
 
+/* CTA-861-H YCbCr 4:2:0 Video Data Block (CTA Y420VDB) */
+static void parse_cta_y420vdb(struct drm_connector *connector,
+			      const struct cea_db *db)
+{
+	struct drm_display_info *info = &connector->display_info;
+	struct drm_hdmi_info *hdmi = &info->hdmi;
+	const u8 *svds = cea_db_data(db) + 1;
+	int i;
+
+	for (i = 0; i < cea_db_payload_len(db) - 1; i++) {
+		u8 vic = svd_to_vic(svds[i]);
+
+		if (!drm_valid_cea_vic(vic))
+			continue;
+
+		bitmap_set(hdmi->y420_vdb_modes, vic, 1);
+		info->color_formats |= DRM_COLOR_FORMAT_YCBCR420;
+	}
+}
+
 static void drm_parse_vcdb(struct drm_connector *connector, const u8 *db)
 {
 	struct drm_display_info *info = &connector->display_info;
@@ -6216,6 +6231,8 @@ static void drm_parse_cea_ext(struct drm_connector *connector,
 			drm_parse_microsoft_vsdb(connector, data);
 		else if (cea_db_is_y420cmdb(db))
 			parse_cta_y420cmdb(connector, db, &y420cmdb_map);
+		else if (cea_db_is_y420vdb(db))
+			parse_cta_y420vdb(connector, db);
 		else if (cea_db_is_vcdb(db))
 			drm_parse_vcdb(connector, data);
 		else if (cea_db_is_hdmi_hdr_metadata_block(db))
-- 
2.34.1


WARNING: multiple messages have this Message-ID (diff)
From: Jani Nikula <jani.nikula@intel.com>
To: dri-devel@lists.freedesktop.org
Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH v7 08/22] drm/edid: split CTA Y420VDB info and mode parsing
Date: Wed,  4 Jan 2023 12:05:23 +0200	[thread overview]
Message-ID: <3bc5fe6650a6ce4249803f7192096764ea724e05.1672826282.git.jani.nikula@intel.com> (raw)
In-Reply-To: <cover.1672826282.git.jani.nikula@intel.com>

Separate the parsing of display info and modes from the CTA
Y420VDB. This is prerequisite work for overall better separation of the
two parsing steps.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/drm_edid.c | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index ead7a4ce0422..076ba125c38d 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -4497,10 +4497,8 @@ drm_display_mode_from_vic_index(struct drm_connector *connector, int vic_index)
 static int do_y420vdb_modes(struct drm_connector *connector,
 			    const u8 *svds, u8 svds_len)
 {
-	int modes = 0, i;
 	struct drm_device *dev = connector->dev;
-	struct drm_display_info *info = &connector->display_info;
-	struct drm_hdmi_info *hdmi = &info->hdmi;
+	int modes = 0, i;
 
 	for (i = 0; i < svds_len; i++) {
 		u8 vic = svd_to_vic(svds[i]);
@@ -4512,13 +4510,10 @@ static int do_y420vdb_modes(struct drm_connector *connector,
 		newmode = drm_mode_duplicate(dev, cea_mode_for_vic(vic));
 		if (!newmode)
 			break;
-		bitmap_set(hdmi->y420_vdb_modes, vic, 1);
 		drm_mode_probed_add(connector, newmode);
 		modes++;
 	}
 
-	if (modes > 0)
-		info->color_formats |= DRM_COLOR_FORMAT_YCBCR420;
 	return modes;
 }
 
@@ -5876,6 +5871,26 @@ static bool cta_vdb_has_vic(const struct drm_connector *connector, u8 vic)
 	return false;
 }
 
+/* CTA-861-H YCbCr 4:2:0 Video Data Block (CTA Y420VDB) */
+static void parse_cta_y420vdb(struct drm_connector *connector,
+			      const struct cea_db *db)
+{
+	struct drm_display_info *info = &connector->display_info;
+	struct drm_hdmi_info *hdmi = &info->hdmi;
+	const u8 *svds = cea_db_data(db) + 1;
+	int i;
+
+	for (i = 0; i < cea_db_payload_len(db) - 1; i++) {
+		u8 vic = svd_to_vic(svds[i]);
+
+		if (!drm_valid_cea_vic(vic))
+			continue;
+
+		bitmap_set(hdmi->y420_vdb_modes, vic, 1);
+		info->color_formats |= DRM_COLOR_FORMAT_YCBCR420;
+	}
+}
+
 static void drm_parse_vcdb(struct drm_connector *connector, const u8 *db)
 {
 	struct drm_display_info *info = &connector->display_info;
@@ -6216,6 +6231,8 @@ static void drm_parse_cea_ext(struct drm_connector *connector,
 			drm_parse_microsoft_vsdb(connector, data);
 		else if (cea_db_is_y420cmdb(db))
 			parse_cta_y420cmdb(connector, db, &y420cmdb_map);
+		else if (cea_db_is_y420vdb(db))
+			parse_cta_y420vdb(connector, db);
 		else if (cea_db_is_vcdb(db))
 			drm_parse_vcdb(connector, data);
 		else if (cea_db_is_hdmi_hdr_metadata_block(db))
-- 
2.34.1


  parent reply	other threads:[~2023-01-04 10:06 UTC|newest]

Thread overview: 97+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-04 10:05 [PATCH v7 00/22] drm/edid: info & modes parsing and drm_edid refactors Jani Nikula
2023-01-04 10:05 ` [Intel-gfx] " Jani Nikula
2023-01-04 10:05 ` [PATCH v7 01/22] drm/edid: fix AVI infoframe aspect ratio handling Jani Nikula
2023-01-04 10:05   ` [Intel-gfx] " Jani Nikula
2023-01-04 10:05   ` Jani Nikula
2023-01-18 14:56   ` [Intel-gfx] " Ville Syrjälä
2023-01-18 14:56     ` Ville Syrjälä
2023-01-18 14:56     ` Ville Syrjälä
2023-01-04 10:05 ` [PATCH v7 02/22] drm/edid: fix parsing of 3D modes from HDMI VSDB Jani Nikula
2023-01-04 10:05   ` [Intel-gfx] " Jani Nikula
2023-01-04 10:05   ` Jani Nikula
2023-01-18 15:00   ` Ville Syrjälä
2023-01-18 15:00     ` Ville Syrjälä
2023-01-18 15:00     ` [Intel-gfx] " Ville Syrjälä
2023-01-04 10:05 ` [PATCH v7 03/22] drm/edid: parse VICs from CTA VDB early Jani Nikula
2023-01-04 10:05   ` [Intel-gfx] " Jani Nikula
2023-01-18 15:12   ` Ville Syrjälä
2023-01-18 15:12     ` [Intel-gfx] " Ville Syrjälä
2023-01-04 10:05 ` [PATCH v7 04/22] drm/edid: Use the pre-parsed VICs Jani Nikula
2023-01-04 10:05   ` [Intel-gfx] " Jani Nikula
2023-01-18 15:08   ` Ville Syrjälä
2023-01-18 15:08     ` [Intel-gfx] " Ville Syrjälä
2023-01-04 10:05 ` [PATCH v7 05/22] drm/edid: use VIC in AVI infoframe if sink lists it in CTA VDB Jani Nikula
2023-01-04 10:05   ` [Intel-gfx] " Jani Nikula
2023-01-18 15:18   ` Ville Syrjälä
2023-01-18 15:18     ` [Intel-gfx] " Ville Syrjälä
2023-01-04 10:05 ` [PATCH v7 06/22] drm/edid: rename struct drm_display_info *display to *info Jani Nikula
2023-01-04 10:05   ` [Intel-gfx] " Jani Nikula
2023-01-18 15:19   ` Ville Syrjälä
2023-01-18 15:19     ` [Intel-gfx] " Ville Syrjälä
2023-01-04 10:05 ` [PATCH v7 07/22] drm/edid: refactor CTA Y420CMDB parsing Jani Nikula
2023-01-04 10:05   ` [Intel-gfx] " Jani Nikula
2023-01-18 15:24   ` Ville Syrjälä
2023-01-18 15:24     ` [Intel-gfx] " Ville Syrjälä
2023-01-04 10:05 ` Jani Nikula [this message]
2023-01-04 10:05   ` [Intel-gfx] [PATCH v7 08/22] drm/edid: split CTA Y420VDB info and mode parsing Jani Nikula
2023-01-18 15:32   ` Ville Syrjälä
2023-01-18 15:32     ` [Intel-gfx] " Ville Syrjälä
2023-01-04 10:05 ` [PATCH v7 09/22] drm/edid: fix and clarify HDMI VSDB audio latency parsing Jani Nikula
2023-01-04 10:05   ` [Intel-gfx] " Jani Nikula
2023-01-18 15:41   ` Ville Syrjälä
2023-01-18 15:41     ` [Intel-gfx] " Ville Syrjälä
2023-01-04 10:05 ` [PATCH v7 10/22] drm/edid: add helper for HDMI VSDB audio latency field length Jani Nikula
2023-01-04 10:05   ` [Intel-gfx] " Jani Nikula
2023-01-18 15:42   ` Ville Syrjälä
2023-01-18 15:42     ` [Intel-gfx] " Ville Syrjälä
2023-01-19  9:44     ` Jani Nikula
2023-01-19  9:44       ` [Intel-gfx] " Jani Nikula
2023-01-04 10:05 ` [PATCH v7 11/22] drm/edid: split HDMI VSDB info and mode parsing Jani Nikula
2023-01-04 10:05   ` [Intel-gfx] " Jani Nikula
2023-01-18 16:08   ` Ville Syrjälä
2023-01-18 16:08     ` [Intel-gfx] " Ville Syrjälä
2023-01-19 15:46   ` [PATCH] " Jani Nikula
2023-01-19 15:46     ` [Intel-gfx] " Jani Nikula
2023-01-19 15:59     ` Ville Syrjälä
2023-01-19 15:59       ` [Intel-gfx] " Ville Syrjälä
2023-01-04 10:05 ` [PATCH v7 12/22] drm/edid: store quirks in display info Jani Nikula
2023-01-04 10:05   ` [Intel-gfx] " Jani Nikula
2023-01-18 16:09   ` Ville Syrjälä
2023-01-18 16:09     ` Ville Syrjälä
2023-01-04 10:05 ` [PATCH v7 13/22] drm/edid: stop passing quirks around Jani Nikula
2023-01-04 10:05   ` [Intel-gfx] " Jani Nikula
2023-01-18 16:09   ` Ville Syrjälä
2023-01-18 16:09     ` [Intel-gfx] " Ville Syrjälä
2023-01-04 10:05 ` [PATCH v7 14/22] drm/edid: merge ELD handling to update_display_info() Jani Nikula
2023-01-04 10:05   ` [Intel-gfx] " Jani Nikula
2023-01-18 16:14   ` Ville Syrjälä
2023-01-18 16:14     ` [Intel-gfx] " Ville Syrjälä
2023-01-04 10:05 ` [PATCH v7 15/22] drm/edid: move EDID BPC quirk application " Jani Nikula
2023-01-04 10:05   ` [Intel-gfx] " Jani Nikula
2023-01-18 16:15   ` Ville Syrjälä
2023-01-18 16:15     ` [Intel-gfx] " Ville Syrjälä
2023-01-19 12:16     ` Jani Nikula
2023-01-19 12:16       ` [Intel-gfx] " Jani Nikula
2023-01-04 10:05 ` [PATCH v7 16/22] drm/edid: refactor _drm_edid_connector_update() and rename Jani Nikula
2023-01-04 10:05   ` [Intel-gfx] " Jani Nikula
2023-01-19 12:19   ` Ville Syrjälä
2023-01-19 12:19     ` Ville Syrjälä
2023-01-04 10:05 ` [PATCH v7 17/22] drm/edid: add separate drm_edid_connector_add_modes() Jani Nikula
2023-01-04 10:05   ` [Intel-gfx] " Jani Nikula
2023-01-19 12:23   ` Ville Syrjälä
2023-01-19 12:23     ` [Intel-gfx] " Ville Syrjälä
2023-01-04 10:05 ` [PATCH v7 18/22] drm/edid: remove redundant _drm_connector_update_edid_property() Jani Nikula
2023-01-04 10:05   ` [Intel-gfx] " Jani Nikula
2023-01-19 12:23   ` Ville Syrjälä
2023-01-19 12:23     ` [Intel-gfx] " Ville Syrjälä
2023-01-04 10:05 ` [PATCH v7 19/22] drm/i915/edid: convert DP, HDMI and LVDS to drm_edid Jani Nikula
2023-01-04 10:05   ` [Intel-gfx] " Jani Nikula
2023-01-04 10:05 ` [PATCH v7 20/22] drm/i915/bios: convert intel_bios_init_panel() " Jani Nikula
2023-01-04 10:05   ` [Intel-gfx] " Jani Nikula
2023-01-04 10:05 ` [PATCH v7 21/22] drm/i915/opregion: convert intel_opregion_get_edid() to struct drm_edid Jani Nikula
2023-01-04 10:05   ` [Intel-gfx] " Jani Nikula
2023-01-04 10:05 ` [PATCH v7 22/22] drm/i915/panel: move panel fixed EDID to struct intel_panel Jani Nikula
2023-01-04 10:05   ` [Intel-gfx] " Jani Nikula
2023-01-04 10:20 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/edid: info & modes parsing and drm_edid refactors Patchwork
2023-01-04 10:40 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2023-01-19 15:49 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/edid: info & modes parsing and drm_edid refactors (rev2) 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=3bc5fe6650a6ce4249803f7192096764ea724e05.1672826282.git.jani.nikula@intel.com \
    --to=jani.nikula@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.