From eabf439fe6d8046c3015e81296b0447f2ca614df Mon Sep 17 00:00:00 2001 From: Uma Shankar Date: Wed, 31 May 2017 15:40:51 +0530 Subject: [PATCH] FROMLIST: drm: Parse HDR metadata info from EDID HDR metadata block is introduced in CEA-861.3 spec. Parsing the same to get the panel's HDR metadata. Change-Id: I4cede936aa4d0ff844fa8abf24cb76211c785d53 Signed-off-by: Uma Shankar Signed-off-by: Zheng Yang (am from https://patchwork.kernel.org/patch/9756421/) --- drivers/gpu/drm/drm_edid.c | 57 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 8ec839f479c1..84ca4b6a303c 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -3676,6 +3676,17 @@ static bool cea_db_is_hdmi_colorimetry_data_block(const u8 *db) return true; } +static bool cea_db_is_hdmi_hdr_metadata_block(const u8 *db) +{ + if (cea_db_tag(db) != DATA_BLOCK_EXTENDED_TAG) + return false; + + if (db[1] != HDR_STATIC_METADATA_BLOCK) + return false; + + return true; +} + static void drm_parse_colorimetry_data_block(struct drm_connector *connector, const u8 *db) { @@ -3686,6 +3697,50 @@ drm_parse_colorimetry_data_block(struct drm_connector *connector, const u8 *db) info->colorimetry = db[2]; } +static uint16_t eotf_supported(const u8 *edid_ext) +{ + uint16_t val = 0; + + if (edid_ext[2] & TRADITIONAL_GAMMA_SDR) + val |= TRADITIONAL_GAMMA_SDR; + if (edid_ext[2] & TRADITIONAL_GAMMA_HDR) + val |= TRADITIONAL_GAMMA_HDR; + if (edid_ext[2] & SMPTE_ST2084) + val |= SMPTE_ST2084; + + return val; +} + +static uint16_t hdr_metadata_type(const u8 *edid_ext) +{ + uint16_t val = 0; + + if (edid_ext[3] & STATIC_METADATA_TYPE1) + val |= STATIC_METADATA_TYPE1; + + return val; +} + +static void +drm_parse_hdr_metadata_block(struct drm_connector *connector, const u8 *db) +{ + uint16_t len; + + len = cea_db_payload_len(db); + connector->hdr_panel_metadata->eotf = eotf_supported(db); + connector->hdr_panel_metadata->type = hdr_metadata_type(db); + + if (len == 6) { + connector->hdr_panel_metadata->max_cll = db[4]; + connector->hdr_panel_metadata->max_fall = db[5]; + connector->hdr_panel_metadata->min_cll = db[6]; + } else if (len == 5) { + connector->hdr_panel_metadata->max_cll = db[4]; + connector->hdr_panel_metadata->max_fall = db[5]; + } else if (len == 4) + connector->hdr_panel_metadata->max_cll = db[4]; +} + static void drm_parse_hdmi_vsdb_audio(struct drm_connector *connector, const u8 *db) { @@ -4290,6 +4345,8 @@ static void drm_parse_cea_ext(struct drm_connector *connector, drm_parse_y420cmdb_bitmap(connector, db); if (cea_db_is_hdmi_colorimetry_data_block(db)) drm_parse_colorimetry_data_block(connector, db); + if (cea_db_is_hdmi_hdr_metadata_block(db)) + drm_parse_hdr_metadata_block(connector, db); } }