From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0C494C2D0DB for ; Fri, 31 Jan 2020 21:01:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D20AC214D8 for ; Fri, 31 Jan 2020 21:01:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="key not found in DNS" (0-bit key) header.d=mg.codeaurora.org header.i=@mg.codeaurora.org header.b="uIgml6b3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726109AbgAaVBo (ORCPT ); Fri, 31 Jan 2020 16:01:44 -0500 Received: from mail26.static.mailgun.info ([104.130.122.26]:15748 "EHLO mail26.static.mailgun.info" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726105AbgAaVBo (ORCPT ); Fri, 31 Jan 2020 16:01:44 -0500 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1580504503; h=Message-ID: References: In-Reply-To: Subject: Cc: To: From: Date: Content-Transfer-Encoding: Content-Type: MIME-Version: Sender; bh=2o/MGv2EXSkD4CZhOwtBopRl7G1ZLM64R+tPgX8YM3c=; b=uIgml6b3zmlfYsJzhG7f765X/sjEKSAYh2sbdCRtNll99+h3yspuQe8wAxPz0Fs8RtdO9Zz0 1es960OejvN2MwG+bO7Re1NKqwJPyuTQx3p2G75XIg78o2t29jWOTEM01GLLnqHMnlGjuCjO fnUnX0KDVlgon/0FOpxjR9N1fb0= X-Mailgun-Sending-Ip: 104.130.122.26 X-Mailgun-Sid: WyI1MzIzYiIsICJsaW51eC1hcm0tbXNtQHZnZXIua2VybmVsLm9yZyIsICJiZTllNGEiXQ== Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by mxa.mailgun.org with ESMTP id 5e3495b3.7fc5a960bbc8-smtp-out-n02; Fri, 31 Jan 2020 21:01:39 -0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 3223CC4479F; Fri, 31 Jan 2020 21:01:39 +0000 (UTC) Received: from mail.codeaurora.org (localhost.localdomain [127.0.0.1]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: abhinavk) by smtp.codeaurora.org (Postfix) with ESMTPSA id 5CFE2C433CB; Fri, 31 Jan 2020 21:01:38 +0000 (UTC) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Fri, 31 Jan 2020 13:01:38 -0800 From: abhinavk@codeaurora.org To: dri-devel@lists.freedesktop.org Cc: adelva@google.com, linux-arm-msm@vger.kernel.org, swboyd@chromium.org, seanpaul@chromium.org, aravindh@codeaurora.org, Uma Shankar Subject: Re: [PATCH v2] drm: Parse Colorimetry data block from EDID In-Reply-To: <1580168406-23808-1-git-send-email-abhinavk@codeaurora.org> References: <1580168406-23808-1-git-send-email-abhinavk@codeaurora.org> Message-ID: <90542e32913e315bae02865e1d18a622@codeaurora.org> X-Sender: abhinavk@codeaurora.org User-Agent: Roundcube Webmail/1.3.9 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Hi Steven Any further comments on this change? Thanks Abhinav On 2020-01-27 15:40, Abhinav Kumar wrote: > From: Uma Shankar > > 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) > > Signed-off-by: Uma Shankar > Signed-off-by: Abhinav Kumar > --- > drivers/gpu/drm/drm_edid.c | 45 > +++++++++++++++++++++++++++++++++++++++++++++ > include/drm/drm_connector.h | 3 +++ > include/drm/drm_edid.h | 14 ++++++++++++++ > 3 files changed, 62 insertions(+) > > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c > index 99769d6..9a82fb8 100644 > --- a/drivers/gpu/drm/drm_edid.c > +++ b/drivers/gpu/drm/drm_edid.c > @@ -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); > } > } > > diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h > index 2219109..a996ee3 100644 > --- a/include/drm/drm_connector.h > +++ b/include/drm/drm_connector.h > @@ -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; > }; > > /** > diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h > index f0b03d4..4f22f22 100644 > --- a/include/drm/drm_edid.h > +++ b/include/drm/drm_edid.h > @@ -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