Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b9b464a authored by Steve Cohen's avatar Steve Cohen
Browse files

drm: add support for parsing HDR10+ EDID data 



Add EDID parsing for sinks supporting HDR10+. Store the
application version code indicating the display's HDR10+
support in the drm_connector for sub-driver use.

Change-Id: Icfb65f8bbf6acb1c86fae90faa1a227997d4ab01
Signed-off-by: default avatarSteve Cohen <cohens@codeaurora.org>
parent 79376733

drivers/gpu/drm/drm_edid.c

+28 −0
Original line number Diff line number Diff line
@@ -2844,6 +2844,9 @@ add_detailed_modes(struct drm_connector *connector, struct edid *edid, 
#define VIDEO_BLOCK     0x02

#define VENDOR_BLOCK    0x03

#define SPEAKER_BLOCK	0x04

#define VENDOR_SPECIFIC_VIDEO_DATA_BLOCK 0x01

#define VSVDB_HDR10_PLUS_IEEE_CODE 0x90848b

#define VSVDB_HDR10_PLUS_APP_VER_MASK 0x3

#define HDR_STATIC_METADATA_EXTENDED_DATA_BLOCK 0x06

#define USE_EXTENDED_TAG 0x07

#define EXT_VIDEO_CAPABILITY_BLOCK 0x00
@@ -3875,6 +3878,28 @@ drm_extract_vcdb_info(struct drm_connector *connector, const u8 *db) 
			  (int) connector->ce_scan_info);

}



static void

drm_parse_vsvdb_hdr_plus(struct drm_connector *connector, const u8 *db)

{

	connector->hdr_plus_app_ver = db[5] & VSVDB_HDR10_PLUS_APP_VER_MASK;

}



static void

drm_extract_vsvdb_info(struct drm_connector *connector, const u8 *db)

{

	u8 db_len = cea_db_payload_len(db);

	u32 ieee_code = 0;



	if (db_len < 5)

		return;



	/* Bytes 2-4: IEEE 24-bit code, LSB first */

	ieee_code = db[2] | (db[3] << 8) | (db[4] << 16);

	DRM_DEBUG_KMS("found VSVDB with IEEE code 0x%x\n", ieee_code);

	if (ieee_code == VSVDB_HDR10_PLUS_IEEE_CODE)

		drm_parse_vsvdb_hdr_plus(connector, db);

}



static bool drm_edid_is_luminance_value_present(

u32 block_length, enum luminance_value value)

{
@@ -3956,6 +3981,9 @@ drm_hdmi_extract_extended_blk_info(struct drm_connector *connector, 
				case VIDEO_CAPABILITY_EXTENDED_DATA_BLOCK:

					drm_extract_vcdb_info(connector, db);

					break;

				case VENDOR_SPECIFIC_VIDEO_DATA_BLOCK:

					drm_extract_vsvdb_info(connector, db);

					break;

				case HDR_STATIC_METADATA_EXTENDED_DATA_BLOCK:

					drm_extract_hdr_db(connector, db);

					break;

include/drm/drm_connector.h

+1 −0
Original line number Diff line number Diff line
@@ -1035,6 +1035,7 @@ struct drm_connector { 
	u32 hdr_avg_luminance;

	u32 hdr_min_luminance;

	bool hdr_supported;

	u8 hdr_plus_app_ver;



	/* EDID bits HDMI 2.0

	 * @max_tmds_char: indicates the maximum TMDS Character Rate supported