From: "Sharma, Shashank" <shashank.sharma@intel.com>
To: "Shankar, Uma" <uma.shankar@intel.com>,
"intel-gfx@lists.freedesktop.org"
<intel-gfx@lists.freedesktop.org>,
"dri-devel@lists.freedesktop.org"
<dri-devel@lists.freedesktop.org>
Cc: "Syrjala, Ville" <ville.syrjala@intel.com>,
"Lankhorst, Maarten" <maarten.lankhorst@intel.com>
Subject: Re: [v5 03/13] drm: Parse Colorimetry data block from EDID
Date: Wed, 20 Mar 2019 13:45:40 +0530 [thread overview]
Message-ID: <c2039025-f167-044f-cbd7-e9e3fed19ec8@intel.com> (raw)
In-Reply-To: <E7C9878FBA1C6D42A1CA3F62AEB6945F81F89E3D@BGSMSX104.gar.corp.intel.com>
On 3/20/2019 12:47 PM, Shankar, Uma wrote:
>
>> -----Original Message-----
>> From: Sharma, Shashank
>> Sent: Friday, March 15, 2019 1:01 PM
>> To: Shankar, Uma <uma.shankar@intel.com>; intel-gfx@lists.freedesktop.org; dri-
>> devel@lists.freedesktop.org
>> Cc: Lankhorst, Maarten <maarten.lankhorst@intel.com>; Syrjala, Ville
>> <ville.syrjala@intel.com>; emil.l.velikov@gmail.com; brian.starkey@arm.com;
>> Liviu.Dudau@arm.com
>> Subject: RE: [v5 03/13] drm: Parse Colorimetry data block from EDID
>>
>>
>>
>>> -----Original Message-----
>>> From: Shankar, Uma
>>> Sent: Monday, March 11, 2019 9:28 AM
>>> To: intel-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org
>>> Cc: Lankhorst, Maarten <maarten.lankhorst@intel.com>; Syrjala, Ville
>>> <ville.syrjala@intel.com>; Sharma, Shashank
>>> <shashank.sharma@intel.com>; emil.l.velikov@gmail.com;
>>> brian.starkey@arm.com; Liviu.Dudau@arm.com; Shankar, Uma
>>> <uma.shankar@intel.com>
>>> Subject: [v5 03/13] drm: Parse Colorimetry data block from EDID
>>>
>>> CEA 861.3 spec adds colorimetry data block for HDMI.
>>> Parsing the block to get the colorimetry data from panel.
>>>
>>> v2: Rebase
>>>
>>> v3: No Change
>>>
>>> v4: Addressed Shashank's review comments. Updated colorimetry field to
>>> 16 bit as
>>> DCI-P3 got added in CEA 861-G spec, as pointed out by Shashank.
>>>
>>> Signed-off-by: Uma Shankar <uma.shankar@intel.com>
>>> ---
>>> drivers/gpu/drm/drm_edid.c | 26 ++++++++++++++++++++++++++
>>> include/drm/drm_connector.h | 3 +++
>>> 2 files changed, 29 insertions(+)
>>>
>>> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
>>> index
>>> c5a81b8..0470845 100644
>>> --- a/drivers/gpu/drm/drm_edid.c
>>> +++ b/drivers/gpu/drm/drm_edid.c
>>> @@ -2834,6 +2834,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 @@ -3823,6 +3824,29 @@ 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) {
>> Same comment for the opening brace above ?
> Again this looks like mail client issue.
>
>>> + if (cea_db_tag(db) != USE_EXTENDED_TAG)
>>> + return false;
>>> +
>>> + if (db[1] != COLORIMETRY_DATA_BLOCK)
>> Space before '!' ?
> Same here.
>
>>> + 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;
>>> + uint16_t len;
>>> +
>>> + len = cea_db_payload_len_ext(db);
>>> + /* As per CEA 861-G spec */
>>> + info->colorimetry = ((db[3] & (0x1 << 7)) << 1) | db[2]; }
>> This means we are setting the 15th bit for DCI-P3 then there is a gap of 7 bits, and
>> then there are other bits. Do we want to make DCI-P3 as bit 8 ? Anyways this can be
>> differed for a discussion later.
> This is at 8th position only. We are shifting the db[3] which is 8 bit by 1 and keeping the 7th bit (DCI-P3)
> at the 8th position (if we count from 0).
>
> Regards,
> Uma Shankar
My bad, its 8th bit only.
If those above alignment problems are checked already, feel free to use
Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
- Shashank
>>> +
>>> +
>>> static bool cea_db_is_hdmi_hdr_metadata_block(const u8 *db) {
>>> if (cea_db_tag(db) != USE_EXTENDED_TAG) @@ -4495,6 +4519,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 29388bd..94f926e 100644
>>> --- a/include/drm/drm_connector.h
>>> +++ b/include/drm/drm_connector.h
>>> @@ -206,6 +206,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;
>> - Shashank
>>> };
>>>
>>> /**
>>> --
>>> 1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-03-20 8:15 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-11 3:57 [v5 00/13] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
2019-03-11 3:57 ` [v5 01/13] drm: Add HDR source metadata property Uma Shankar
2019-03-15 7:08 ` Sharma, Shashank
2019-03-20 6:21 ` Shankar, Uma
2019-03-11 3:57 ` [v5 02/13] drm: Parse HDR metadata info from EDID Uma Shankar
2019-03-15 7:26 ` Sharma, Shashank
2019-03-20 6:37 ` Shankar, Uma
2019-03-11 3:57 ` [v5 03/13] drm: Parse Colorimetry data block " Uma Shankar
2019-03-15 7:30 ` Sharma, Shashank
2019-03-20 7:17 ` Shankar, Uma
2019-03-20 8:15 ` Sharma, Shashank [this message]
2019-03-20 8:58 ` Shankar, Uma
2019-03-11 3:57 ` [v5 04/13] drm/i915: Attach HDR metadata property to connector Uma Shankar
2019-03-15 7:36 ` Sharma, Shashank
2019-03-20 7:58 ` Shankar, Uma
2019-03-11 3:57 ` [v5 05/13] drm: Implement HDR output metadata set and get property handling Uma Shankar
2019-03-11 3:57 ` [v5 06/13] drm: Enable HDR infoframe support Uma Shankar
2019-03-15 8:23 ` Sharma, Shashank
2019-03-20 9:24 ` Shankar, Uma
2019-03-11 3:57 ` [v5 07/13] drm/i915: Write HDR infoframe and send to panel Uma Shankar
2019-03-15 11:07 ` Sharma, Shashank
2019-03-20 9:46 ` Shankar, Uma
2019-03-11 3:57 ` [v5 08/13] drm/i915: [DO NOT MERGE] hack for glk board outputs Uma Shankar
2019-03-11 3:58 ` [v5 09/13] drm/i915: Add HLG EOTF Uma Shankar
2019-03-15 11:09 ` Sharma, Shashank
2019-03-11 3:58 ` [v5 10/13] drm/i915: Enable infoframes on GLK+ for HDR Uma Shankar
2019-03-11 3:58 ` [v5 11/13] drm/i915:Enabled Modeset when HDR Infoframe changes Uma Shankar
2019-03-11 3:58 ` [v5 12/13] drm/i915: Set Infoframe for non modeset case for HDR Uma Shankar
2019-03-11 3:58 ` [v5 13/13] video/hdmi: Add const variants for drm infoframe Uma Shankar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c2039025-f167-044f-cbd7-e9e3fed19ec8@intel.com \
--to=shashank.sharma@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=maarten.lankhorst@intel.com \
--cc=uma.shankar@intel.com \
--cc=ville.syrjala@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox