Commit fbb5d035 authored by Uma Shankar's avatar Uma Shankar Committed by Ville Syrjälä
Browse files

drm: Add HDR source metadata property 



This patch adds a blob property to get HDR metadata
information from userspace. This will be send as part
of AVI Infoframe to panel.

It also implements get() and set() functions for HDR output
metadata property.The blob data is received from userspace and
saved in connector state, the same is returned as blob in get
property call to userspace.

v2: Rebase and modified the metadata structure elements
as per Ville's POC changes.

v3: No Change

v4: Addressed Shashank's review comments

v5: Rebase.

v6: Addressed Brian Starkey's review comments, defined
new structure with header for dynamic metadata scalability.
Merge get/set property functions for metadata in this patch.

v7: Addressed Jonas Karlman review comments and defined separate
structure for infoframe to better align with CTA 861.G spec. Added
Shashank's RB.

v8: Addressed Ville's review comments. Moved sink metadata structure
out of uapi headers as suggested by Jonas Karlman.

v9: Rebase and addressed Jonas Karlman review comments.

v10: Addressed Ville's review comments, dropped the metdata_changed
state variable as its not needed anymore.

Signed-off-by: default avatarUma Shankar <uma.shankar@intel.com>
Reviewed-by: default avatarShashank Sharma <shashank.sharma@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1558015817-12025-2-git-send-email-uma.shankar@intel.com
parent b681af0b

drivers/gpu/drm/drm_atomic_uapi.c

+12 −0
Original line number Diff line number Diff line
@@ -676,6 +676,8 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector, 
{

	struct drm_device *dev = connector->dev;

	struct drm_mode_config *config = &dev->mode_config;

	bool replaced = false;

	int ret;



	if (property == config->prop_crtc_id) {

		struct drm_crtc *crtc = drm_crtc_find(dev, file_priv, val);
@@ -726,6 +728,13 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector, 
		 */

		if (state->link_status != DRM_LINK_STATUS_GOOD)

			state->link_status = val;

	} else if (property == config->hdr_output_metadata_property) {

		ret = drm_atomic_replace_property_blob_from_id(dev,

				&state->hdr_output_metadata,

				val,

				sizeof(struct hdr_output_metadata), -1,

				&replaced);

		return ret;

	} else if (property == config->aspect_ratio_property) {

		state->picture_aspect_ratio = val;

	} else if (property == config->content_type_property) {
@@ -814,6 +823,9 @@ drm_atomic_connector_get_property(struct drm_connector *connector, 
		*val = state->colorspace;

	} else if (property == connector->scaling_mode_property) {

		*val = state->scaling_mode;

	} else if (property == config->hdr_output_metadata_property) {

		*val = state->hdr_output_metadata ?

			state->hdr_output_metadata->base.id : 0;

	} else if (property == connector->content_protection_property) {

		*val = state->content_protection;

	} else if (property == config->writeback_fb_id_property) {

drivers/gpu/drm/drm_connector.c

+6 −0
Original line number Diff line number Diff line
@@ -1058,6 +1058,12 @@ int drm_connector_create_standard_properties(struct drm_device *dev) 
		return -ENOMEM;

	dev->mode_config.non_desktop_property = prop;



	prop = drm_property_create(dev, DRM_MODE_PROP_BLOB,

				   "HDR_OUTPUT_METADATA", 0);

	if (!prop)

		return -ENOMEM;

	dev->mode_config.hdr_output_metadata_property = prop;



	return 0;

}

include/drm/drm_connector.h

+10 −0
Original line number Diff line number Diff line
@@ -603,6 +603,12 @@ struct drm_connector_state { 
	 * and the connector bpc limitations obtained from edid.

	 */

	u8 max_bpc;



	/**

	 * @hdr_output_metadata:

	 * DRM blob property for HDR output metadata

	 */

	struct drm_property_blob *hdr_output_metadata;

};



/**
@@ -1243,6 +1249,10 @@ struct drm_connector { 
	 * &drm_mode_config.connector_free_work.

	 */

	struct llist_node free_node;



	/* HDR metdata */

	struct hdr_output_metadata hdr_output_metadata;

	struct hdr_sink_metadata hdr_sink_metadata;

};



#define obj_to_connector(x) container_of(x, struct drm_connector, base)

include/drm/drm_mode_config.h

+7 −0
Original line number Diff line number Diff line
@@ -836,6 +836,13 @@ struct drm_mode_config { 
	 */

	struct drm_property *writeback_out_fence_ptr_property;



	/**

	 * hdr_output_metadata_property: Connector property containing hdr

	 * metatda. This will be provided by userspace compositors based

	 * on HDR content

	 */

	struct drm_property *hdr_output_metadata_property;



	/* dumb ioctl parameters */

	uint32_t preferred_depth, prefer_shadow;

include/linux/hdmi.h

+26 −0
Original line number Diff line number Diff line
@@ -152,6 +152,16 @@ enum hdmi_content_type { 
	HDMI_CONTENT_TYPE_GAME,

};



enum hdmi_metadata_type {

	HDMI_STATIC_METADATA_TYPE1 = 1,

};



enum hdmi_eotf {

	HDMI_EOTF_TRADITIONAL_GAMMA_SDR,

	HDMI_EOTF_TRADITIONAL_GAMMA_HDR,

	HDMI_EOTF_SMPTE_ST2084,

};



struct hdmi_avi_infoframe {

	enum hdmi_infoframe_type type;

	unsigned char version;
@@ -320,6 +330,22 @@ struct hdmi_vendor_infoframe { 
	unsigned int s3d_ext_data;

};



/* HDR Metadata as per 861.G spec */

struct hdr_static_metadata {

	__u8 eotf;

	__u8 metadata_type;

	__u16 max_cll;

	__u16 max_fall;

	__u16 min_cll;

};



struct hdr_sink_metadata {

	__u32 metadata_type;

	union {

		struct hdr_static_metadata hdmi_type1;

	};

};



int hdmi_vendor_infoframe_init(struct hdmi_vendor_infoframe *frame);

ssize_t hdmi_vendor_infoframe_pack(struct hdmi_vendor_infoframe *frame,

				   void *buffer, size_t size);

CRA Git | Maintained and supported by SUSTech CRA and CCSE