drm: Parse Colorimetry data block from EDID
Subsystems (3)
PATCH v2 1/1 drm: Parse Colorimetry data block from EDID
From: Uma Shankar <[email protected]>
CEA 861.3 spec adds colorimetry data block for HDMI. Parsing the block to get the colorimetry data from panel.
This was posted by Uma Shankar at
https://patchwork.kernel.org/patch/10861327/
Modified by Abhinav Kumar:
- Use macros to distinguish the bit fields for clarity
Changes in v2:
- Use the drm_edid.h macros in drm_edid.c (Stephen Boyd)
--- drivers/gpu/drm/drm_edid.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ include/drm/drm_connector.h | 3 +++ include/drm/drm_edid.h | 14 ++++++++++++++ 3 files changed, 62 insertions(+)
drivers/gpu/drm/drm_edid.c +45 -0
@@ -3136,6 +3136,7 @@ static int drm_cvt_modes(struct drm_connector *connector,#define VIDEO_BLOCK 0x02#define VENDOR_BLOCK 0x03#define SPEAKER_BLOCK 0x04 +#define COLORIMETRY_DATA_BLOCK 0x5#define HDR_STATIC_METADATA_BLOCK 0x6#define USE_EXTENDED_TAG 0x07#define EXT_VIDEO_CAPABILITY_BLOCK 0x00
@@ -4199,6 +4200,48 @@ static void fixup_detailed_cea_mode_clock(struct drm_display_mode *mode) mode->clock = clock; } +static bool cea_db_is_hdmi_colorimetry_data_block (const u8 *db) +{ +if (cea_db_tag (db) !=USE_EXTENDED_TAG ) +return false; + +if (db[1 ] !=COLORIMETRY_DATA_BLOCK ) +return false; + +if (cea_db_payload_len (db) <2 ) +return false; + +return true; +} + +static void +drm_parse_colorimetry_data_block (struct drm_connector *connector,const u8 *db) +{ +struct drm_hdmi_info *info = &connector->display_info.hdmi; + +if (db[2 ] & DRM_EDID_CLRMETRY_xvYCC_601) + info->colorimetry |= DRM_EDID_CLRMETRY_xvYCC_601; +if (db[2 ] & DRM_EDID_CLRMETRY_xvYCC_709) + info->colorimetry |= DRM_EDID_CLRMETRY_xvYCC_709; +if (db[2 ] & DRM_EDID_CLRMETRY_sYCC_601) + info->colorimetry |= DRM_EDID_CLRMETRY_sYCC_601; +if (db[2 ] &DRM_EDID_CLRMETRY_ADBYCC_601 ) + info->colorimetry |=DRM_EDID_CLRMETRY_ADBYCC_601 ; +if (db[2 ] &DRM_EDID_CLRMETRY_ADB_RGB ) + info->colorimetry |=DRM_EDID_CLRMETRY_ADB_RGB ; +if (db[2 ] &DRM_EDID_CLRMETRY_BT2020_CYCC ) + info->colorimetry |=DRM_EDID_CLRMETRY_BT2020_CYCC ; +if (db[2 ] &DRM_EDID_CLRMETRY_BT2020_YCC ) + info->colorimetry |=DRM_EDID_CLRMETRY_BT2020_YCC ; +if (db[2 ] &DRM_EDID_CLRMETRY_BT2020_RGB ) + info->colorimetry |=DRM_EDID_CLRMETRY_BT2020_RGB ; +/* Byte 4 Bit 7: DCI-P3 */ +if (db[3 ] &BIT (7 )) + info->colorimetry |=DRM_EDID_CLRMETRY_DCI_P3 ; + +DRM_DEBUG_KMS ("Supported Colorimetry 0x%x\n" , info->colorimetry); +} +static bool cea_db_is_hdmi_hdr_metadata_block (const u8 *db) {if (cea_db_tag (db) !=USE_EXTENDED_TAG )
@@ -4877,6 +4920,8 @@ static void drm_parse_cea_ext(struct drm_connector *connector,drm_parse_vcdb (connector, db);if (cea_db_is_hdmi_hdr_metadata_block (db))drm_parse_hdr_metadata_block (connector, db); +if (cea_db_is_hdmi_colorimetry_data_block (db)) +drm_parse_colorimetry_data_block (connector, db); } }
include/drm/drm_connector.h +3 -0
@@ -207,6 +207,9 @@ struct drm_hdmi_info {/** @y420_dc_modes: bitmap of deep color support index */ u8 y420_dc_modes; + +/* @colorimetry: bitmap of supported colorimetry modes */ +u16 colorimetry; };/**
include/drm/drm_edid.h +14 -0
@@ -224,6 +224,20 @@ struct detailed_timing { DRM_EDID_YCBCR420_DC_36 | \ DRM_EDID_YCBCR420_DC_30) +/* +* Supported Colorimetry from colorimetry data block +* as per CEA 861-G spec +*/ +#define DRM_EDID_CLRMETRY_xvYCC_601 (1 << 0) +#define DRM_EDID_CLRMETRY_xvYCC_709 (1 << 1) +#define DRM_EDID_CLRMETRY_sYCC_601 (1 << 2) +#define DRM_EDID_CLRMETRY_ADBYCC_601 (1 << 3) +#define DRM_EDID_CLRMETRY_ADB_RGB (1 << 4) +#define DRM_EDID_CLRMETRY_BT2020_CYCC (1 << 5) +#define DRM_EDID_CLRMETRY_BT2020_YCC (1 << 6) +#define DRM_EDID_CLRMETRY_BT2020_RGB (1 << 7) +#define DRM_EDID_CLRMETRY_DCI_P3 (1 << 15) +/* ELD Header Block */ #define DRM_ELD_HEADER_BLOCK_SIZE 4
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Hi Steven
Any further comments on this change?
Thanks
Abhinav
Quoted 136 lines · Abhinav Kumar
From: Uma Shankar <[email protected]>
CEA 861.3 spec adds colorimetry data block for HDMI. Parsing the block to get the colorimetry data from panel.
This was posted by Uma Shankar at
https://patchwork.kernel.org/patch/10861327/Modified by Abhinav Kumar:
- Use macros to distinguish the bit fields for clarityChanges in v2:
- Use thedrm_edid.hmacros indrm_edid.c(Stephen Boyd)Signed-off-by Uma Shankar <[email protected]>Signed-off-by Abhinav Kumar <[email protected]>--- drivers/gpu/drm/drm_edid.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ include/drm/drm_connector.h | 3 +++ include/drm/drm_edid.h | 14 ++++++++++++++ 3 files changed, 62 insertions(+)drivers/gpu/drm/drm_edid.c +1
-0@@ -3136,6 +3136,7 @@ static int drm_cvt_modes(struct drm_connector *connector,#define VIDEO_BLOCK 0x02#define VENDOR_BLOCK 0x03#define SPEAKER_BLOCK 0x04 +#define COLORIMETRY_DATA_BLOCK 0x5#define HDR_STATIC_METADATA_BLOCK 0x6#define USE_EXTENDED_TAG 0x07#define
EXT_VIDEO_CAPABILITY_BLOCK0x00drivers/gpu/drm/drm_edid.c +42
-0@@ -4199,6 +4200,48 @@ static void fixup_detailed_cea_mode_clock(struct drm_display_mode *mode) mode->clock = clock; } +static bool cea_db_is_hdmi_colorimetry_data_block (const u8 *db) +{ +if (cea_db_tag (db) !=USE_EXTENDED_TAG ) +return false; + +if (db[1 ] !=COLORIMETRY_DATA_BLOCK ) +return false; + +if (cea_db_payload_len (db) <2 ) +return false; + +return true; +} + +static void +drm_parse_colorimetry_data_block (struct drm_connector *connector,const u8 *db) +{ +struct drm_hdmi_info *info = &connector->display_info.hdmi; + +if (db[2 ] & DRM_EDID_CLRMETRY_xvYCC_601) + info->colorimetry |= DRM_EDID_CLRMETRY_xvYCC_601; +if (db[2 ] & DRM_EDID_CLRMETRY_xvYCC_709) + info->colorimetry |= DRM_EDID_CLRMETRY_xvYCC_709; +if (db[2 ] & DRM_EDID_CLRMETRY_sYCC_601) + info->colorimetry |= DRM_EDID_CLRMETRY_sYCC_601; +if (db[2 ] &DRM_EDID_CLRMETRY_ADBYCC_601 ) + info->colorimetry |=DRM_EDID_CLRMETRY_ADBYCC_601 ; +if (db[2 ] &DRM_EDID_CLRMETRY_ADB_RGB ) + info->colorimetry |=DRM_EDID_CLRMETRY_ADB_RGB ; +if (db[2 ] &DRM_EDID_CLRMETRY_BT2020_CYCC ) + info->colorimetry |=DRM_EDID_CLRMETRY_BT2020_CYCC ; +if (db[2 ] &DRM_EDID_CLRMETRY_BT2020_YCC ) + info->colorimetry |=DRM_EDID_CLRMETRY_BT2020_YCC ; +if (db[2 ] &DRM_EDID_CLRMETRY_BT2020_RGB ) + info->colorimetry |=DRM_EDID_CLRMETRY_BT2020_RGB ; +/* Byte 4 Bit 7: DCI-P3 */ +if (db[3 ] &BIT (7 )) + info->colorimetry |=DRM_EDID_CLRMETRY_DCI_P3 ; + +DRM_DEBUG_KMS ("Supported Colorimetry 0x%x\n" , info->colorimetry); +} +static bool cea_db_is_hdmi_hdr_metadata_block (const u8 *db){
drivers/gpu/drm/drm_edid.c +2
-0if (cea_db_tag (db) !=USE_EXTENDED_TAG )@@ -4877,6 +4920,8 @@ static void drm_parse_cea_ext(structdrm_connector *connector,drm_parse_vcdb (connector ,db );if (cea_db_is_hdmi_hdr_metadata_block (db))drm_parse_hdr_metadata_block (connector, db); +if (cea_db_is_hdmi_colorimetry_data_block (db)) +drm_parse_colorimetry_data_block (connector, db); } }include/drm/drm_connector.h +3
-0@@ -207,6 +207,9 @@ struct drm_hdmi_info {/** @y420_dc_modes: bitmap of deep color support index */ u8 y420_dc_modes; + +/* @colorimetry: bitmap of supported colorimetry modes */ +u16 colorimetry; };/** include/drm/drm_edid.h +14
-0@@ -224,6 +224,20 @@ struct detailed_timing { DRM_EDID_YCBCR420_DC_36 | \ DRM_EDID_YCBCR420_DC_30) +/* +* Supported Colorimetry from colorimetry data block +* as per CEA 861-G spec +*/ +#define DRM_EDID_CLRMETRY_xvYCC_601 (1 << 0) +#define DRM_EDID_CLRMETRY_xvYCC_709 (1 << 1) +#define DRM_EDID_CLRMETRY_sYCC_601 (1 << 2) +#define DRM_EDID_CLRMETRY_ADBYCC_601 (1 << 3) +#define DRM_EDID_CLRMETRY_ADB_RGB (1 << 4) +#define DRM_EDID_CLRMETRY_BT2020_CYCC (1 << 5) +#define DRM_EDID_CLRMETRY_BT2020_YCC (1 << 6) +#define DRM_EDID_CLRMETRY_BT2020_RGB (1 << 7) +#define DRM_EDID_CLRMETRY_DCI_P3 (1 << 15) +/* ELD Header Block */ #define DRM_ELD_HEADER_BLOCK_SIZE 4
Quoting [email protected] (2020-01-31 13:01:38)
Quoted 4 lines
Hi Steven
Any further comments on this change?
No. I was more of a drive by review comment on the previous patch.