[v5,07/13] drm/i915: Write HDR infoframe and send to panel

Submitted by Shankar, Uma on March 11, 2019, 3:57 a.m.

Details

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

Commit Message

Shankar, Uma March 11, 2019, 3:57 a.m.
Enable writing of HDR metadata infoframe to panel.
The data will be provid by usersapace compositors, based
on blending policies and passsed to driver through a blob
property.

v2: Rebase

v3: Fixed a warning message

v4: Addressed Shashank's review comments

v5: Rebase. Added infoframe calculation in compute config.

Signed-off-by: Uma Shankar <uma.shankar@intel.com>
---
 drivers/gpu/drm/i915/intel_drv.h  |  1 +
 drivers/gpu/drm/i915/intel_hdmi.c | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 58483f8..a5ee124 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1037,6 +1037,7 @@  struct intel_crtc_state {
 		union hdmi_infoframe avi;
 		union hdmi_infoframe spd;
 		union hdmi_infoframe hdmi;
+		union hdmi_infoframe drm;
 	} infoframes;
 
 	/* HDMI scrambling status */
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 0952475..ea7afa0 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -555,6 +555,7 @@  static u32 hsw_infoframes_enabled(struct intel_encoder *encoder,
 	HDMI_INFOFRAME_TYPE_AVI,
 	HDMI_INFOFRAME_TYPE_SPD,
 	HDMI_INFOFRAME_TYPE_VENDOR,
+	HDMI_INFOFRAME_TYPE_DRM,
 };
 
 u32 intel_hdmi_infoframe_enable(unsigned int type)
@@ -777,6 +778,30 @@  void intel_read_infoframe(struct intel_encoder *encoder,
 	return true;
 }
 
+static bool
+intel_hdmi_compute_drm_infoframe(struct intel_encoder *encoder,
+				  struct intel_crtc_state *crtc_state,
+				  struct drm_connector_state *conn_state)
+{
+	struct hdmi_drm_infoframe *frame = &crtc_state->infoframes.drm.drm;
+	struct hdr_static_metadata *hdr_metadata;
+	int ret;
+
+	hdr_metadata = (struct hdr_static_metadata *)
+			conn_state->hdr_output_metadata_blob_ptr->data;
+
+	ret = drm_hdmi_infoframe_set_hdr_metadata(frame, hdr_metadata);
+	if (ret < 0) {
+		DRM_ERROR("couldn't set HDR metadata in infoframe\n");
+		return false;
+	}
+
+	crtc_state->infoframes.enable |=
+		intel_hdmi_infoframe_enable(HDMI_INFOFRAME_TYPE_DRM);
+
+	return true;
+}
+
 static void g4x_set_infoframes(struct intel_encoder *encoder,
 			       bool enable,
 			       const struct intel_crtc_state *crtc_state,
@@ -1175,6 +1200,9 @@  static void hsw_set_infoframes(struct intel_encoder *encoder,
 	intel_write_infoframe(encoder, crtc_state,
 			      HDMI_INFOFRAME_TYPE_VENDOR,
 			      &crtc_state->infoframes.hdmi);
+	intel_write_infoframe(encoder, crtc_state,
+			      HDMI_INFOFRAME_TYPE_DRM,
+			      &crtc_state->infoframes.drm);
 }
 
 void intel_dp_dual_mode_set_tmds_output(struct intel_hdmi *hdmi, bool enable)
@@ -2381,6 +2409,11 @@  int intel_hdmi_compute_config(struct intel_encoder *encoder,
 		return -EINVAL;
 	}
 
+	if (!intel_hdmi_compute_drm_infoframe(encoder, pipe_config, conn_state)) {
+		DRM_DEBUG_KMS("bad DRM infoframe\n");
+		return -EINVAL;
+	}
+
 	return 0;
 }
 

Comments

On 3/11/2019 9:27 AM, Uma Shankar wrote:
> Enable writing of HDR metadata infoframe to panel.
> The data will be provid by usersapace compositors, based
> on blending policies and passsed to driver through a blob
> property.
>
> v2: Rebase
>
> v3: Fixed a warning message
>
> v4: Addressed Shashank's review comments
>
> v5: Rebase. Added infoframe calculation in compute config.
>
> Signed-off-by: Uma Shankar <uma.shankar@intel.com>
> ---
>   drivers/gpu/drm/i915/intel_drv.h  |  1 +
>   drivers/gpu/drm/i915/intel_hdmi.c | 33 +++++++++++++++++++++++++++++++++
>   2 files changed, 34 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 58483f8..a5ee124 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -1037,6 +1037,7 @@ struct intel_crtc_state {
>   		union hdmi_infoframe avi;
>   		union hdmi_infoframe spd;
>   		union hdmi_infoframe hdmi;
> +		union hdmi_infoframe drm;
>   	} infoframes;
>   
>   	/* HDMI scrambling status */
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index 0952475..ea7afa0 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -555,6 +555,7 @@ static u32 hsw_infoframes_enabled(struct intel_encoder *encoder,
>   	HDMI_INFOFRAME_TYPE_AVI,
>   	HDMI_INFOFRAME_TYPE_SPD,
>   	HDMI_INFOFRAME_TYPE_VENDOR,
> +	HDMI_INFOFRAME_TYPE_DRM,
>   };
>   
>   u32 intel_hdmi_infoframe_enable(unsigned int type)
> @@ -777,6 +778,30 @@ void intel_read_infoframe(struct intel_encoder *encoder,
>   	return true;
>   }
>   
> +static bool
> +intel_hdmi_compute_drm_infoframe(struct intel_encoder *encoder,
> +				  struct intel_crtc_state *crtc_state,
> +				  struct drm_connector_state *conn_state)
> +{
> +	struct hdmi_drm_infoframe *frame = &crtc_state->infoframes.drm.drm;
> +	struct hdr_static_metadata *hdr_metadata;
> +	int ret;
> +

Don't we need a GEN/monitor check before going ahead with HDR metadata ?

- Shashank

> +	hdr_metadata = (struct hdr_static_metadata *)
> +			conn_state->hdr_output_metadata_blob_ptr->data;
> +
> +	ret = drm_hdmi_infoframe_set_hdr_metadata(frame, hdr_metadata);
> +	if (ret < 0) {
> +		DRM_ERROR("couldn't set HDR metadata in infoframe\n");
> +		return false;
> +	}
> +
> +	crtc_state->infoframes.enable |=
> +		intel_hdmi_infoframe_enable(HDMI_INFOFRAME_TYPE_DRM);
> +
> +	return true;
> +}
> +
>   static void g4x_set_infoframes(struct intel_encoder *encoder,
>   			       bool enable,
>   			       const struct intel_crtc_state *crtc_state,
> @@ -1175,6 +1200,9 @@ static void hsw_set_infoframes(struct intel_encoder *encoder,
>   	intel_write_infoframe(encoder, crtc_state,
>   			      HDMI_INFOFRAME_TYPE_VENDOR,
>   			      &crtc_state->infoframes.hdmi);
> +	intel_write_infoframe(encoder, crtc_state,
> +			      HDMI_INFOFRAME_TYPE_DRM,
> +			      &crtc_state->infoframes.drm);
>   }
>   
>   void intel_dp_dual_mode_set_tmds_output(struct intel_hdmi *hdmi, bool enable)
> @@ -2381,6 +2409,11 @@ int intel_hdmi_compute_config(struct intel_encoder *encoder,
>   		return -EINVAL;
>   	}
>   
> +	if (!intel_hdmi_compute_drm_infoframe(encoder, pipe_config, conn_state)) {
> +		DRM_DEBUG_KMS("bad DRM infoframe\n");
> +		return -EINVAL;
> +	}
> +
>   	return 0;
>   }
>
>-----Original Message-----

>From: Sharma, Shashank

>Sent: Friday, March 15, 2019 4:38 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 07/13] drm/i915: Write HDR infoframe and send to panel

>

>

>On 3/11/2019 9:27 AM, Uma Shankar wrote:

>> Enable writing of HDR metadata infoframe to panel.

>> The data will be provid by usersapace compositors, based on blending

>> policies and passsed to driver through a blob property.

>>

>> v2: Rebase

>>

>> v3: Fixed a warning message

>>

>> v4: Addressed Shashank's review comments

>>

>> v5: Rebase. Added infoframe calculation in compute config.

>>

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

>> ---

>>   drivers/gpu/drm/i915/intel_drv.h  |  1 +

>>   drivers/gpu/drm/i915/intel_hdmi.c | 33 +++++++++++++++++++++++++++++++++

>>   2 files changed, 34 insertions(+)

>>

>> diff --git a/drivers/gpu/drm/i915/intel_drv.h

>> b/drivers/gpu/drm/i915/intel_drv.h

>> index 58483f8..a5ee124 100644

>> --- a/drivers/gpu/drm/i915/intel_drv.h

>> +++ b/drivers/gpu/drm/i915/intel_drv.h

>> @@ -1037,6 +1037,7 @@ struct intel_crtc_state {

>>   		union hdmi_infoframe avi;

>>   		union hdmi_infoframe spd;

>>   		union hdmi_infoframe hdmi;

>> +		union hdmi_infoframe drm;

>>   	} infoframes;

>>

>>   	/* HDMI scrambling status */

>> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c

>> b/drivers/gpu/drm/i915/intel_hdmi.c

>> index 0952475..ea7afa0 100644

>> --- a/drivers/gpu/drm/i915/intel_hdmi.c

>> +++ b/drivers/gpu/drm/i915/intel_hdmi.c

>> @@ -555,6 +555,7 @@ static u32 hsw_infoframes_enabled(struct intel_encoder

>*encoder,

>>   	HDMI_INFOFRAME_TYPE_AVI,

>>   	HDMI_INFOFRAME_TYPE_SPD,

>>   	HDMI_INFOFRAME_TYPE_VENDOR,

>> +	HDMI_INFOFRAME_TYPE_DRM,

>>   };

>>

>>   u32 intel_hdmi_infoframe_enable(unsigned int type) @@ -777,6 +778,30

>> @@ void intel_read_infoframe(struct intel_encoder *encoder,

>>   	return true;

>>   }

>>

>> +static bool

>> +intel_hdmi_compute_drm_infoframe(struct intel_encoder *encoder,

>> +				  struct intel_crtc_state *crtc_state,

>> +				  struct drm_connector_state *conn_state) {

>> +	struct hdmi_drm_infoframe *frame = &crtc_state->infoframes.drm.drm;

>> +	struct hdr_static_metadata *hdr_metadata;

>> +	int ret;

>> +

>

>Don't we need a GEN/monitor check before going ahead with HDR metadata ?


Sure, will add that check.

Regards,
Uma Shankar

>- Shashank

>

>> +	hdr_metadata = (struct hdr_static_metadata *)

>> +			conn_state->hdr_output_metadata_blob_ptr->data;

>> +

>> +	ret = drm_hdmi_infoframe_set_hdr_metadata(frame, hdr_metadata);

>> +	if (ret < 0) {

>> +		DRM_ERROR("couldn't set HDR metadata in infoframe\n");

>> +		return false;

>> +	}

>> +

>> +	crtc_state->infoframes.enable |=

>> +		intel_hdmi_infoframe_enable(HDMI_INFOFRAME_TYPE_DRM);

>> +

>> +	return true;

>> +}

>> +

>>   static void g4x_set_infoframes(struct intel_encoder *encoder,

>>   			       bool enable,

>>   			       const struct intel_crtc_state *crtc_state, @@ -1175,6

>> +1200,9 @@ static void hsw_set_infoframes(struct intel_encoder *encoder,

>>   	intel_write_infoframe(encoder, crtc_state,

>>   			      HDMI_INFOFRAME_TYPE_VENDOR,

>>   			      &crtc_state->infoframes.hdmi);

>> +	intel_write_infoframe(encoder, crtc_state,

>> +			      HDMI_INFOFRAME_TYPE_DRM,

>> +			      &crtc_state->infoframes.drm);

>>   }

>>

>>   void intel_dp_dual_mode_set_tmds_output(struct intel_hdmi *hdmi,

>> bool enable) @@ -2381,6 +2409,11 @@ int intel_hdmi_compute_config(struct

>intel_encoder *encoder,

>>   		return -EINVAL;

>>   	}

>>

>> +	if (!intel_hdmi_compute_drm_infoframe(encoder, pipe_config, conn_state)) {

>> +		DRM_DEBUG_KMS("bad DRM infoframe\n");

>> +		return -EINVAL;

>> +	}

>> +

>>   	return 0;

>>   }

>>