Attachment 83302 Details for Bug 67030 – Parse 4k VICs

[patch] Parse 4k VICs

0001-drm-edid-Parse-the-HDMI-CEA-block-and-look-for-4k-mo.patch (text/plain), 5.27 KB, created by Damien Lespiau on 2013-07-30 14:01:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Lespiau

Created: 2013-07-30 14:01:14 UTC

Size: 5.27 KB

patch

obsolete

>From 099961d4ee48a0e704df4ddbd44b4abc94c74b51 Mon Sep 17 00:00:00 2001
>From: Damien Lespiau <damien.lespiau@intel.com>
>Date: Mon, 29 Jul 2013 17:02:15 +0100
>Subject: [PATCH] drm/edid: Parse the HDMI CEA block and look for 4k modes
>
>HDMI 1.4 adds 4 "4k x 2k" modes in the the CEA vendor specific block.
>
>With this commit, we now parse this block and expose the 4k modes that
>we find there.
>
>Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
>---
> drivers/gpu/drm/drm_edid.c | 129 ++++++++++++++++++++++++++++++++++++++-------
> 1 file changed, 109 insertions(+), 20 deletions(-)
>
>diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
>index 95d6f4b..d263896 100644
>--- a/drivers/gpu/drm/drm_edid.c
>+++ b/drivers/gpu/drm/drm_edid.c
>@@ -931,6 +931,36 @@ static const struct drm_display_mode edid_cea_modes[] = {
> 	 .vrefresh = 100, },
> };
> 
>+/*
>+ * HDMI 1.4 4k modes.
>+ */
>+static const struct drm_display_mode edid_4k_modes[] = {
>+	/* 1 - 3840x2160@30Hz */
>+	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000,
>+		   3840, 4016, 4104, 4400, 0,
>+		   2160, 2168, 2178, 2250, 0,
>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
>+	  .vrefresh = 30, },
>+	/* 2 - 3840x2160@25Hz */
>+	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000,
>+		   3840, 4896, 4984, 5280, 0,
>+		   2160, 2168, 2178, 2250, 0,
>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
>+	  .vrefresh = 25, },
>+	/* 3 - 3840x2160@24Hz */
>+	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000,
>+		   3840, 5096, 5184, 5480, 0,
>+		   2160, 2168, 2178, 2250, 0,
>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
>+	  .vrefresh = 24, },
>+	/* 4 - 4096x2160@24Hz (SMPTE) */
>+	{ DRM_MODE("3840x2160", DRM_MODE_TYPE_DRIVER, 297000,
>+		   4096, 5116, 5204, 5500, 0,
>+		   2160, 2168, 2178, 2250, 0,
>+		   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
>+	  .vrefresh = 24, },
>+};
>+
> /*** DDC fetch and block validation ***/
> 
> static const u8 edid_header[] = {
>@@ -2442,10 +2472,10 @@ add_alternate_cea_modes(struct drm_connector *connector, struct edid *edid)
> }
> 
> static int
>-do_cea_modes (struct drm_connector *connector, u8 *db, u8 len)
>+do_cea_modes(struct drm_connector *connector, u8 *db, u8 len)
> {
> 	struct drm_device *dev = connector->dev;
>-	u8 * mode, cea_mode;
>+	u8 *mode, cea_mode;
> 	int modes = 0;
> 
> 	for (mode = db; mode < db + len; mode++) {
>@@ -2465,6 +2495,63 @@ do_cea_modes (struct drm_connector *connector, u8 *db, u8 len)
> 	return modes;
> }
> 
>+static int do_hdmi_vsdb_modes(struct drm_connector *connector, u8 *db, u8 len)
>+{
>+	struct drm_device *dev = connector->dev;
>+	int modes = 0, offset = 0, i;
>+	u8 vic_len;
>+
>+	if (len < 8)
>+		goto out;
>+
>+	/* no HDMI_Video_Present */
>+	if (!(db[8] & (1 << 5)))
>+		goto out;
>+
>+	/* Latency_Fields_Present */
>+	if (db[8] & (1 << 7))
>+		offset += 2;
>+
>+	/* I_Latency_Fields_Present */
>+	if (db[8] & (1 << 6))
>+		offset += 2;
>+
>+	/* the declared length is not long enough for the 2 first bytes
>+	 * of additional video format capabilities */
>+	if (len < (10 + offset))
>+		goto out;
>+
>+	vic_len =  db[10 + offset] >> 5;
>+	offset += 2;
>+
>+	DRM_DEBUG_KMS("XXX: Found %d modes in the HDMI vsdb\n", vic_len);
>+
>+	for (i = 0; i < vic_len && len >= (9 + offset + i); i++) {
>+		struct drm_display_mode *newmode;
>+		u8 vic;
>+
>+		vic = db[9 + offset + i];
>+
>+		DRM_DEBUG_KMS("XXX: Found VIC %d \n", vic);
>+
>+		vic--; /* VICs start at 1 */
>+		if (vic >= ARRAY_SIZE(edid_4k_modes)) {
>+			DRM_ERROR("Unknow HDMI VIC: %d\n", vic);
>+			continue;
>+		}
>+
>+		newmode = drm_mode_duplicate(dev, &edid_4k_modes[vic]);
>+		if (!newmode)
>+			continue;
>+
>+		drm_mode_probed_add(connector, newmode);
>+		modes++;
>+	}
>+
>+out:
>+	return modes;
>+}
>+
> static int
> cea_db_payload_len(const u8 *db)
> {
>@@ -2496,14 +2583,29 @@ cea_db_offsets(const u8 *cea, int *start, int *end)
> 	return 0;
> }
> 
>+static bool cea_db_is_hdmi_vsdb(const u8 *db)
>+{
>+	int hdmi_id;
>+
>+	if (cea_db_tag(db) != VENDOR_BLOCK)
>+		return false;
>+
>+	if (cea_db_payload_len(db) < 5)
>+		return false;
>+
>+	hdmi_id = db[1] | (db[2] << 8) | (db[3] << 16);
>+
>+	return hdmi_id == HDMI_IDENTIFIER;
>+}
>+
> #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)
> 
> static int
> add_cea_modes(struct drm_connector *connector, struct edid *edid)
> {
>-	u8 * cea = drm_find_cea_extension(edid);
>-	u8 * db, dbl;
>+	u8 *cea = drm_find_cea_extension(edid);
>+	u8 *db, dbl;
> 	int modes = 0;
> 
> 	if (cea && cea_revision(cea) >= 3) {
>@@ -2517,7 +2619,9 @@ add_cea_modes(struct drm_connector *connector, struct edid *edid)
> 			dbl = cea_db_payload_len(db);
> 
> 			if (cea_db_tag(db) == VIDEO_BLOCK)
>-				modes += do_cea_modes (connector, db+1, dbl);
>+				modes += do_cea_modes(connector, db + 1, dbl);
>+			else if (cea_db_is_hdmi_vsdb(db))
>+				modes += do_hdmi_vsdb_modes(connector, db, dbl);
> 		}
> 	}
> 
>@@ -2570,21 +2674,6 @@ monitor_name(struct detailed_timing *t, void *data)
> 		*(u8 **)data = t->data.other_data.data.str.str;
> }
> 
>-static bool cea_db_is_hdmi_vsdb(const u8 *db)
>-{
>-	int hdmi_id;
>-
>-	if (cea_db_tag(db) != VENDOR_BLOCK)
>-		return false;
>-
>-	if (cea_db_payload_len(db) < 5)
>-		return false;
>-
>-	hdmi_id = db[1] | (db[2] << 8) | (db[3] << 16);
>-
>-	return hdmi_id == HDMI_IDENTIFIER;
>-}
>-
> /**
>  * drm_edid_to_eld - build ELD from EDID
>  * @connector: connector corresponding to the HDMI/DP sink
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 67030: 82577 | 82766 | 82769 | 82796 | 82800 | 82805 | 82809 | 83302 | 83338 | 83387 | 83745 | 83746 | 83761 | 90869 | 92647

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.