[v2,11/14] drm/i915: Add HLG EOTF

Submitted by Shankar, Uma on Dec. 11, 2018, 8:38 p.m.

Details

Message ID 1544560702-16447-12-git-send-email-uma.shankar@intel.com
State New
Headers show
Series "Add HDR Metadata Parsing and handling in DRM layer" ( rev: 2 ) in DRI devel

Commit Message

Shankar, Uma Dec. 11, 2018, 8:38 p.m.
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

ADD HLG EOTF to the list of EOTF transfer functions
supported.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
---
 drivers/gpu/drm/drm_edid.c | 4 ++--
 include/linux/hdmi.h       | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 5a7fc9b..fa86494 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -3857,8 +3857,8 @@  static uint16_t eotf_supported(const u8 *edid_ext)
 	return edid_ext[2] &
 		(BIT(HDMI_EOTF_TRADITIONAL_GAMMA_SDR) |
 		 BIT(HDMI_EOTF_TRADITIONAL_GAMMA_HDR) |
-		 BIT(HDMI_EOTF_SMPTE_ST2084));
-
+		 BIT(HDMI_EOTF_SMPTE_ST2084) |
+		 BIT(HDMI_EOTF_BT_2100_HLG));
 }
 
 static uint16_t hdr_metadata_type(const u8 *edid_ext)
diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h
index ce00e1e..b5346c3 100644
--- a/include/linux/hdmi.h
+++ b/include/linux/hdmi.h
@@ -146,6 +146,7 @@  enum hdmi_eotf {
 	HDMI_EOTF_TRADITIONAL_GAMMA_SDR,
 	HDMI_EOTF_TRADITIONAL_GAMMA_HDR,
 	HDMI_EOTF_SMPTE_ST2084,
+	HDMI_EOTF_BT_2100_HLG,
 };
 
 struct hdmi_avi_infoframe {

Comments

Regards

Shashank


On 12/12/2018 2:08 AM, Uma Shankar wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> ADD HLG EOTF to the list of EOTF transfer functions
> supported.
Would it be possible to add some details about HLG ?
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Signed-off-by: Uma Shankar <uma.shankar@intel.com>
> ---
>   drivers/gpu/drm/drm_edid.c | 4 ++--
>   include/linux/hdmi.h       | 1 +
>   2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> index 5a7fc9b..fa86494 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -3857,8 +3857,8 @@ static uint16_t eotf_supported(const u8 *edid_ext)
>   	return edid_ext[2] &
>   		(BIT(HDMI_EOTF_TRADITIONAL_GAMMA_SDR) |
>   		 BIT(HDMI_EOTF_TRADITIONAL_GAMMA_HDR) |
> -		 BIT(HDMI_EOTF_SMPTE_ST2084));
> -
> +		 BIT(HDMI_EOTF_SMPTE_ST2084) |
> +		 BIT(HDMI_EOTF_BT_2100_HLG));
>   }
>   
>   static uint16_t hdr_metadata_type(const u8 *edid_ext)
> diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h
> index ce00e1e..b5346c3 100644
> --- a/include/linux/hdmi.h
> +++ b/include/linux/hdmi.h
> @@ -146,6 +146,7 @@ enum hdmi_eotf {
>   	HDMI_EOTF_TRADITIONAL_GAMMA_SDR,
>   	HDMI_EOTF_TRADITIONAL_GAMMA_HDR,
>   	HDMI_EOTF_SMPTE_ST2084,
> +	HDMI_EOTF_BT_2100_HLG,
>   };
>   
>   struct hdmi_avi_infoframe {
>-----Original Message-----

>From: Sharma, Shashank

>Sent: Friday, December 21, 2018 2:17 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>; Brian.Starkey@arm.com; Ville Syrjälä

><ville.syrjala@linux.intel.com>

>Subject: Re: [v2 11/14] drm/i915: Add HLG EOTF

>

>Regards

>

>Shashank

>

>

>On 12/12/2018 2:08 AM, Uma Shankar wrote:

>> From: Ville Syrjälä <ville.syrjala@linux.intel.com>

>>

>> ADD HLG EOTF to the list of EOTF transfer functions supported.

>Would it be possible to add some details about HLG ?


Sure, will add that.

Regards,
Uma Shankar

>>

>> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

>> Signed-off-by: Uma Shankar <uma.shankar@intel.com>

>> ---

>>   drivers/gpu/drm/drm_edid.c | 4 ++--

>>   include/linux/hdmi.h       | 1 +

>>   2 files changed, 3 insertions(+), 2 deletions(-)

>>

>> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c

>> index 5a7fc9b..fa86494 100644

>> --- a/drivers/gpu/drm/drm_edid.c

>> +++ b/drivers/gpu/drm/drm_edid.c

>> @@ -3857,8 +3857,8 @@ static uint16_t eotf_supported(const u8 *edid_ext)

>>   	return edid_ext[2] &

>>   		(BIT(HDMI_EOTF_TRADITIONAL_GAMMA_SDR) |

>>   		 BIT(HDMI_EOTF_TRADITIONAL_GAMMA_HDR) |

>> -		 BIT(HDMI_EOTF_SMPTE_ST2084));

>> -

>> +		 BIT(HDMI_EOTF_SMPTE_ST2084) |

>> +		 BIT(HDMI_EOTF_BT_2100_HLG));

>>   }

>>

>>   static uint16_t hdr_metadata_type(const u8 *edid_ext)

>> diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h

>> index ce00e1e..b5346c3 100644

>> --- a/include/linux/hdmi.h

>> +++ b/include/linux/hdmi.h

>> @@ -146,6 +146,7 @@ enum hdmi_eotf {

>>   	HDMI_EOTF_TRADITIONAL_GAMMA_SDR,

>>   	HDMI_EOTF_TRADITIONAL_GAMMA_HDR,

>>   	HDMI_EOTF_SMPTE_ST2084,

>> +	HDMI_EOTF_BT_2100_HLG,

>>   };

>>

>>   struct hdmi_avi_infoframe {