dri-devel.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: Uma Shankar <uma.shankar@intel.com>
To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Cc: dcastagna@chromium.org, jonas@kwiboo.se, seanpaul@chromium.org
Subject: [v11 03/12] drm: Parse HDR metadata info from EDID
Date: Thu, 16 May 2019 19:40:08 +0530	[thread overview]
Message-ID: <1558015817-12025-4-git-send-email-uma.shankar@intel.com> (raw)
In-Reply-To: <1558015817-12025-1-git-send-email-uma.shankar@intel.com>

HDR metadata block is introduced in CEA-861.3 spec.
Parsing the same to get the panel's HDR metadata.

v2: Rebase and added Ville's POC changes to the patch.

v3: No Change

v4: Addressed Shashank's review comments

v5: Addressed Shashank's comment and added his RB.

v6: Addressed Jonas Karlman review comments.

v7: Adressed Ville's review comments and fixed the issue
with length handling.

v8: Put the length check as per the convention followed in
existing code, as suggested by Ville.

Signed-off-by: Uma Shankar <uma.shankar@intel.com>
Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
---
 drivers/gpu/drm/drm_edid.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 852bdd8..a5ef9f4 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -2852,6 +2852,7 @@ static int drm_cvt_modes(struct drm_connector *connector,
 #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_DATA_BLOCK_420	0x0E
@@ -3834,6 +3835,54 @@ static void fixup_detailed_cea_mode_clock(struct drm_display_mode *mode)
 	mode->clock = clock;
 }
 
+static bool cea_db_is_hdmi_hdr_metadata_block(const u8 *db)
+{
+	if (cea_db_tag(db) != USE_EXTENDED_TAG)
+		return false;
+
+	if (db[1] != HDR_STATIC_METADATA_BLOCK)
+		return false;
+
+	if (cea_db_payload_len(db) < 3)
+		return false;
+
+	return true;
+}
+
+static uint8_t eotf_supported(const u8 *edid_ext)
+{
+	return edid_ext[2] &
+		(BIT(HDMI_EOTF_TRADITIONAL_GAMMA_SDR) |
+		 BIT(HDMI_EOTF_TRADITIONAL_GAMMA_HDR) |
+		 BIT(HDMI_EOTF_SMPTE_ST2084));
+}
+
+static uint8_t hdr_metadata_type(const u8 *edid_ext)
+{
+	return edid_ext[3] &
+		BIT(HDMI_STATIC_METADATA_TYPE1);
+}
+
+static void
+drm_parse_hdr_metadata_block(struct drm_connector *connector, const u8 *db)
+{
+	u16 len;
+
+	len = cea_db_payload_len(db);
+
+	connector->hdr_sink_metadata.hdmi_type1.eotf =
+						eotf_supported(db);
+	connector->hdr_sink_metadata.hdmi_type1.metadata_type =
+						hdr_metadata_type(db);
+
+	if (len >= 4)
+		connector->hdr_sink_metadata.hdmi_type1.max_cll = db[4];
+	if (len >= 5)
+		connector->hdr_sink_metadata.hdmi_type1.max_fall = db[5];
+	if (len >= 6)
+		connector->hdr_sink_metadata.hdmi_type1.min_cll = db[6];
+}
+
 static void
 drm_parse_hdmi_vsdb_audio(struct drm_connector *connector, const u8 *db)
 {
@@ -4461,6 +4510,8 @@ static void drm_parse_cea_ext(struct drm_connector *connector,
 			drm_parse_y420cmdb_bitmap(connector, db);
 		if (cea_db_is_vcdb(db))
 			drm_parse_vcdb(connector, db);
+		if (cea_db_is_hdmi_hdr_metadata_block(db))
+			drm_parse_hdr_metadata_block(connector, db);
 	}
 }
 
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2019-05-16 14:10 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-16 14:10 [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
2019-05-16 14:10 ` [v11 01/12] drm: Add HDR source metadata property Uma Shankar
2019-05-16 14:10 ` [v11 02/12] drm: Add reference counting on HDR metadata blob Uma Shankar
2019-05-16 14:10 ` Uma Shankar [this message]
2019-05-16 14:10 ` [v11 04/12] drm: Enable HDR infoframe support Uma Shankar
2019-05-16 14:10 ` [v11 05/12] drm/i915: Attach HDR metadata property to connector Uma Shankar
2019-05-17 14:06   ` Ville Syrjälä
2019-05-16 14:10 ` [v11 06/12] drm/i915: Write HDR infoframe and send to panel Uma Shankar
2019-05-17 14:06   ` Ville Syrjälä
2019-05-16 14:10 ` [v11 07/12] drm: Add HLG EOTF Uma Shankar
2019-05-16 14:10 ` [v11 08/12] drm/i915: Enable infoframes on GLK+ for HDR Uma Shankar
2019-05-17 14:01   ` Ville Syrjälä
2019-05-16 14:10 ` [v11 09/12] drm/i915:Enabled Modeset when HDR Infoframe changes Uma Shankar
2019-05-16 14:10 ` [v11 10/12] drm/i915: Added DRM Infoframe handling for BYT/CHT Uma Shankar
2019-05-16 14:10 ` [v11 11/12] video/hdmi: Add Unpack function for DRM infoframe Uma Shankar
2019-05-16 14:10 ` [v11 12/12] drm/i915: Add state readout " Uma Shankar
2019-05-22 20:45 ` [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Ville Syrjälä
2019-05-23  8:09   ` Jani Nikula
2019-05-23  8:41     ` [Intel-gfx] " Daniel Vetter
2019-05-28 11:35   ` Maarten Lankhorst
2019-05-28 11:43     ` Shankar, Uma
2019-05-29  9:43 ` Daniel Vetter
2019-05-29 13:58   ` Shankar, Uma
2019-05-29 15:03     ` [Intel-gfx] " Daniel Vetter
2019-05-29 17:28       ` Shankar, Uma
2019-05-29 17:35         ` Daniel Vetter
2019-05-29 17:39           ` [Intel-gfx] " Shankar, Uma

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=1558015817-12025-4-git-send-email-uma.shankar@intel.com \
    --to=uma.shankar@intel.com \
    --cc=dcastagna@chromium.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jonas@kwiboo.se \
    --cc=seanpaul@chromium.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;
as well as URLs for NNTP newsgroup(s).