diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index e734742486c7..87f5d0c8f5c9 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -3961,48 +3961,6 @@ 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_EXTENDED_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) @@ -4910,8 +4868,6 @@ 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); } } diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index d1dd028b33fa..856645305525 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -208,9 +208,6 @@ 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; }; /**