All of lore.kernel.org
 help / color / mirror / Atom feed
* [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer
@ 2019-05-16 14:10 Uma Shankar
  2019-05-16 14:10 ` [v11 01/12] drm: Add HDR source metadata property Uma Shankar
                   ` (22 more replies)
  0 siblings, 23 replies; 40+ messages in thread
From: Uma Shankar @ 2019-05-16 14:10 UTC (permalink / raw)
  To: intel-gfx, dri-devel
  Cc: dcastagna, jonas, emil.l.velikov, Uma Shankar, seanpaul

This patch series enables HDR support in drm. It basically defines
HDR metadata structures, property to pass content (after blending)
metadata from user space compositors to driver.

Dynamic Range and Mastering infoframe creation and sending.

ToDo:
1. We need to get the color framework in place for all planes
   which support HDR content in hardware. This is already in progres
   and patches are out for review in mailing list.
2. UserSpace/Compositors: Blending policies and metadata blob
   creation and passing to driver. Work is already in progress
   by Intel's middleware teams on wayland and the patches for
   the same are in review.

A POC has already been developed by Ville based on wayland. Please refer
below link to see the component interactions and usage:
https://lists.freedesktop.org/archives/wayland-devel/2017-December/036403.html

v2: Updated Ville's POC changes to the patch series.Incorporated cleanups
and fixes from Ville. Rebase on latest drm-tip.

v3: Fixed a warning causing builds to break on CI. No major change.

v4: Addressed Shashank's review comments.

v5: Rebase on top of Ville's infoframe refactoring changes. Fixed non modeset
case for HDR metadata update. Dropped a redundant patch.

v6: Addressed Shashank's review comments and added RB's received.

v7: Squashed 2 patches, dropped 1 change and addressed Brian Starkey's and
Shashank's review comments.

v8: Addressed Jonas Karlman review comments. Added Shashank's RB to the series,
fixed a WARN_ON on BYT/CHT.

v9: Addressed Ville and Jonas Karlman's review comments. Added the infoframe
state readout and metadata reference count.

v10: Addressed review comments from Jonas and Ville. Dropped one patch related
to i915 fastset handling as per Ville's feedback.

v11: Addressed Ville's review comments.

Note: v9 version is already tested with Kodi and a confirmation from team kodi has been
received. Branch details for the same as below:
https://github.com/xbmc/xbmc/tree/feature_drmprime-vaapi

v9 of this series is:
Tested-by: Jonas Karlman <jonas@kwiboo.se>

Jonas Karlman (1):
  drm: Add reference counting on HDR metadata blob

Uma Shankar (9):
  drm: Add HDR source metadata property
  drm: Parse HDR metadata info from EDID
  drm: Enable HDR infoframe support
  drm/i915: Attach HDR metadata property to connector
  drm/i915: Write HDR infoframe and send to panel
  drm/i915:Enabled Modeset when HDR Infoframe changes
  drm/i915: Added DRM Infoframe handling for BYT/CHT
  video/hdmi: Add Unpack function for DRM infoframe
  drm/i915: Add state readout for DRM infoframe

Ville Syrjälä (2):
  drm: Add HLG EOTF
  drm/i915: Enable infoframes on GLK+ for HDR

 drivers/gpu/drm/drm_atomic_state_helper.c |   5 +
 drivers/gpu/drm/drm_atomic_uapi.c         |  12 ++
 drivers/gpu/drm/drm_connector.c           |   6 +
 drivers/gpu/drm/drm_edid.c                | 124 ++++++++++++++
 drivers/gpu/drm/i915/i915_reg.h           |   4 +
 drivers/gpu/drm/i915/intel_atomic.c       |  14 +-
 drivers/gpu/drm/i915/intel_ddi.c          |   3 +
 drivers/gpu/drm/i915/intel_display.c      |   1 +
 drivers/gpu/drm/i915/intel_drv.h          |   1 +
 drivers/gpu/drm/i915/intel_hdmi.c         |  67 +++++++-
 drivers/video/hdmi.c                      | 257 ++++++++++++++++++++++++++++++
 include/drm/drm_connector.h               |  10 ++
 include/drm/drm_edid.h                    |   5 +
 include/drm/drm_mode_config.h             |   7 +
 include/linux/hdmi.h                      |  55 +++++++
 include/uapi/drm/drm_mode.h               |  23 +++
 16 files changed, 589 insertions(+), 5 deletions(-)

-- 
1.9.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 40+ messages in thread

* [v11 01/12] drm: Add HDR source metadata property
  2019-05-16 14:10 [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
@ 2019-05-16 14:10 ` Uma Shankar
  2019-05-16 14:10 ` [v11 02/12] drm: Add reference counting on HDR metadata blob Uma Shankar
                   ` (21 subsequent siblings)
  22 siblings, 0 replies; 40+ messages in thread
From: Uma Shankar @ 2019-05-16 14:10 UTC (permalink / raw)
  To: intel-gfx, dri-devel
  Cc: dcastagna, jonas, emil.l.velikov, Uma Shankar, seanpaul

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: Uma Shankar <uma.shankar@intel.com>
Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
---
 drivers/gpu/drm/drm_atomic_uapi.c | 12 ++++++++++++
 drivers/gpu/drm/drm_connector.c   |  6 ++++++
 include/drm/drm_connector.h       | 10 ++++++++++
 include/drm/drm_mode_config.h     |  7 +++++++
 include/linux/hdmi.h              | 26 ++++++++++++++++++++++++++
 include/uapi/drm/drm_mode.h       | 23 +++++++++++++++++++++++
 6 files changed, 84 insertions(+)

diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c
index 4131e66..eb22e8b 100644
--- a/drivers/gpu/drm/drm_atomic_uapi.c
+++ b/drivers/gpu/drm/drm_atomic_uapi.c
@@ -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 @@ static int drm_atomic_connector_set_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 == config->content_protection_property) {
 		*val = state->content_protection;
 	} else if (property == config->writeback_fb_id_property) {
diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
index 11fcd25..c9ac8b9 100644
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
@@ -1051,6 +1051,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;
 }
 
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index e257b87..f8f4003 100644
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
@@ -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;
 };
 
 /**
@@ -1237,6 +1243,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)
diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h
index 5764ee3..58278cc 100644
--- a/include/drm/drm_mode_config.h
+++ b/include/drm/drm_mode_config.h
@@ -842,6 +842,13 @@ struct drm_mode_config {
 	 */
 	struct drm_property *content_protection_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;
 
diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h
index 927ad64..6780476 100644
--- a/include/linux/hdmi.h
+++ b/include/linux/hdmi.h
@@ -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);
diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h
index 83cd163..997a7e0 100644
--- a/include/uapi/drm/drm_mode.h
+++ b/include/uapi/drm/drm_mode.h
@@ -630,6 +630,29 @@ struct drm_color_lut {
 	__u16 reserved;
 };
 
+/* HDR Metadata Infoframe as per 861.G spec */
+struct hdr_metadata_infoframe {
+	__u8 eotf;
+	__u8 metadata_type;
+	struct {
+		__u16 x, y;
+		} display_primaries[3];
+	struct {
+		__u16 x, y;
+		} white_point;
+	__u16 max_display_mastering_luminance;
+	__u16 min_display_mastering_luminance;
+	__u16 max_cll;
+	__u16 max_fall;
+};
+
+struct hdr_output_metadata {
+	__u32 metadata_type;
+	union {
+		struct hdr_metadata_infoframe hdmi_metadata_type1;
+	};
+};
+
 #define DRM_MODE_PAGE_FLIP_EVENT 0x01
 #define DRM_MODE_PAGE_FLIP_ASYNC 0x02
 #define DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE 0x4
-- 
1.9.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [v11 02/12] drm: Add reference counting on HDR metadata blob
  2019-05-16 14:10 [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
  2019-05-16 14:10 ` [v11 01/12] drm: Add HDR source metadata property Uma Shankar
@ 2019-05-16 14:10 ` Uma Shankar
  2019-05-16 14:10 ` [v11 03/12] drm: Parse HDR metadata info from EDID Uma Shankar
                   ` (20 subsequent siblings)
  22 siblings, 0 replies; 40+ messages in thread
From: Uma Shankar @ 2019-05-16 14:10 UTC (permalink / raw)
  To: intel-gfx, dri-devel; +Cc: dcastagna, jonas, seanpaul

From: Jonas Karlman <jonas@kwiboo.se>

This adds reference count for HDR metadata blob,
handled as part of duplicate and destroy connector
state functions.

v2: Removed the hdr_metadata_changed initialization as
the variable is dropped and not required.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
---
 drivers/gpu/drm/drm_atomic_state_helper.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c
index ac929f6..ec13823 100644
--- a/drivers/gpu/drm/drm_atomic_state_helper.c
+++ b/drivers/gpu/drm/drm_atomic_state_helper.c
@@ -391,6 +391,9 @@ void drm_atomic_helper_connector_reset(struct drm_connector *connector)
 		drm_connector_get(connector);
 	state->commit = NULL;
 
+	if (state->hdr_output_metadata)
+		drm_property_blob_get(state->hdr_output_metadata);
+
 	/* Don't copy over a writeback job, they are used only once */
 	state->writeback_job = NULL;
 }
@@ -438,6 +441,8 @@ struct drm_connector_state *
 
 	if (state->writeback_job)
 		drm_writeback_cleanup_job(state->writeback_job);
+
+	drm_property_blob_put(state->hdr_output_metadata);
 }
 EXPORT_SYMBOL(__drm_atomic_helper_connector_destroy_state);
 
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [v11 03/12] drm: Parse HDR metadata info from EDID
  2019-05-16 14:10 [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
  2019-05-16 14:10 ` [v11 01/12] drm: Add HDR source metadata property Uma Shankar
  2019-05-16 14:10 ` [v11 02/12] drm: Add reference counting on HDR metadata blob Uma Shankar
@ 2019-05-16 14:10 ` Uma Shankar
  2019-05-16 14:10 ` [v11 04/12] drm: Enable HDR infoframe support Uma Shankar
                   ` (19 subsequent siblings)
  22 siblings, 0 replies; 40+ messages in thread
From: Uma Shankar @ 2019-05-16 14:10 UTC (permalink / raw)
  To: intel-gfx, dri-devel; +Cc: dcastagna, jonas, seanpaul

HDR metadata block is introduced in CEA-861.3 spec.
Parsing the same to get the panel's HDR metadata.

v2: Rebase and added Ville's POC changes to the patch.

v3: No Change

v4: Addressed Shashank's review comments

v5: Addressed Shashank's comment and added his RB.

v6: Addressed Jonas Karlman review comments.

v7: Adressed Ville's review comments and fixed the issue
with length handling.

v8: Put the length check as per the convention followed in
existing code, as suggested by Ville.

Signed-off-by: Uma Shankar <uma.shankar@intel.com>
Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
---
 drivers/gpu/drm/drm_edid.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 852bdd8..a5ef9f4 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -2852,6 +2852,7 @@ static int drm_cvt_modes(struct drm_connector *connector,
 #define VIDEO_BLOCK     0x02
 #define VENDOR_BLOCK    0x03
 #define SPEAKER_BLOCK	0x04
+#define HDR_STATIC_METADATA_BLOCK	0x6
 #define USE_EXTENDED_TAG 0x07
 #define EXT_VIDEO_CAPABILITY_BLOCK 0x00
 #define EXT_VIDEO_DATA_BLOCK_420	0x0E
@@ -3834,6 +3835,54 @@ static void fixup_detailed_cea_mode_clock(struct drm_display_mode *mode)
 	mode->clock = clock;
 }
 
+static bool cea_db_is_hdmi_hdr_metadata_block(const u8 *db)
+{
+	if (cea_db_tag(db) != USE_EXTENDED_TAG)
+		return false;
+
+	if (db[1] != HDR_STATIC_METADATA_BLOCK)
+		return false;
+
+	if (cea_db_payload_len(db) < 3)
+		return false;
+
+	return true;
+}
+
+static uint8_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));
+}
+
+static uint8_t hdr_metadata_type(const u8 *edid_ext)
+{
+	return edid_ext[3] &
+		BIT(HDMI_STATIC_METADATA_TYPE1);
+}
+
+static void
+drm_parse_hdr_metadata_block(struct drm_connector *connector, const u8 *db)
+{
+	u16 len;
+
+	len = cea_db_payload_len(db);
+
+	connector->hdr_sink_metadata.hdmi_type1.eotf =
+						eotf_supported(db);
+	connector->hdr_sink_metadata.hdmi_type1.metadata_type =
+						hdr_metadata_type(db);
+
+	if (len >= 4)
+		connector->hdr_sink_metadata.hdmi_type1.max_cll = db[4];
+	if (len >= 5)
+		connector->hdr_sink_metadata.hdmi_type1.max_fall = db[5];
+	if (len >= 6)
+		connector->hdr_sink_metadata.hdmi_type1.min_cll = db[6];
+}
+
 static void
 drm_parse_hdmi_vsdb_audio(struct drm_connector *connector, const u8 *db)
 {
@@ -4461,6 +4510,8 @@ static void drm_parse_cea_ext(struct drm_connector *connector,
 			drm_parse_y420cmdb_bitmap(connector, db);
 		if (cea_db_is_vcdb(db))
 			drm_parse_vcdb(connector, db);
+		if (cea_db_is_hdmi_hdr_metadata_block(db))
+			drm_parse_hdr_metadata_block(connector, db);
 	}
 }
 
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [v11 04/12] drm: Enable HDR infoframe support
  2019-05-16 14:10 [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
                   ` (2 preceding siblings ...)
  2019-05-16 14:10 ` [v11 03/12] drm: Parse HDR metadata info from EDID Uma Shankar
@ 2019-05-16 14:10 ` Uma Shankar
  2019-05-16 14:10 ` [v11 05/12] drm/i915: Attach HDR metadata property to connector Uma Shankar
                   ` (18 subsequent siblings)
  22 siblings, 0 replies; 40+ messages in thread
From: Uma Shankar @ 2019-05-16 14:10 UTC (permalink / raw)
  To: intel-gfx, dri-devel
  Cc: dcastagna, jonas, emil.l.velikov, Uma Shankar, seanpaul

Enable Dynamic Range and Mastering Infoframe for HDR
content, which is defined in CEA 861.3 spec.

The metadata will be computed based on blending
policy in userspace compositors and passed as a connector
property blob to driver. The same will be sent as infoframe
to panel which support HDR.

Added the const version of infoframe for DRM metadata
for HDR.

v2: Rebase and added Ville's POC changes.

v3: No Change

v4: Addressed Shashank's review comments and merged the
patch making drm infoframe function arguments as constant.

v5: Rebase

v6: Fixed checkpatch warnings with --strict option. Addressed
Shashank's review comments and added his RB.

v7: Addressed Brian Starkey's review comments. Merged 2 patches
into one.

v8: Addressed Jonas Karlman review comments.

v9: Addressed Jonas Karlman review comments.

v10: Addressed Ville's review comments.

v11: Added BUILD_BUG_ON and sizeof instead of magic numbers as
per Ville's comments.

Signed-off-by: Uma Shankar <uma.shankar@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
---
 drivers/gpu/drm/drm_edid.c |  72 +++++++++++++++++
 drivers/video/hdmi.c       | 190 +++++++++++++++++++++++++++++++++++++++++++++
 include/drm/drm_edid.h     |   5 ++
 include/linux/hdmi.h       |  28 +++++++
 4 files changed, 295 insertions(+)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index a5ef9f4..73560c9 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -4904,6 +4904,78 @@ static bool is_hdmi2_sink(struct drm_connector *connector)
 		connector->display_info.color_formats & DRM_COLOR_FORMAT_YCRCB420;
 }
 
+static inline bool is_eotf_supported(u8 output_eotf, u8 sink_eotf)
+{
+	return sink_eotf & BIT(output_eotf);
+}
+
+/**
+ * drm_hdmi_infoframe_set_hdr_metadata() - fill an HDMI DRM infoframe with
+ *                                         HDR metadata from userspace
+ * @frame: HDMI DRM infoframe
+ * @hdr_metadata: hdr_source_metadata info from userspace
+ *
+ * Return: 0 on success or a negative error code on failure.
+ */
+int
+drm_hdmi_infoframe_set_hdr_metadata(struct hdmi_drm_infoframe *frame,
+				    const struct drm_connector_state *conn_state)
+{
+	struct drm_connector *connector;
+	struct hdr_output_metadata *hdr_metadata;
+	int err;
+
+	if (!frame || !conn_state)
+		return -EINVAL;
+
+	connector = conn_state->connector;
+
+	if (!conn_state->hdr_output_metadata)
+		return -EINVAL;
+
+	hdr_metadata = conn_state->hdr_output_metadata->data;
+
+	if (!hdr_metadata || !connector)
+		return -EINVAL;
+
+	/* Sink EOTF is Bit map while infoframe is absolute values */
+	if (!is_eotf_supported(hdr_metadata->hdmi_metadata_type1.eotf,
+	    connector->hdr_sink_metadata.hdmi_type1.eotf)) {
+		DRM_DEBUG_KMS("EOTF Not Supported\n");
+		return -EINVAL;
+	}
+
+	err = hdmi_drm_infoframe_init(frame);
+	if (err < 0)
+		return err;
+
+	frame->eotf = hdr_metadata->hdmi_metadata_type1.eotf;
+	frame->metadata_type = hdr_metadata->hdmi_metadata_type1.metadata_type;
+
+	BUILD_BUG_ON(sizeof(frame->display_primaries) !=
+		     sizeof(hdr_metadata->hdmi_metadata_type1.display_primaries));
+	BUILD_BUG_ON(sizeof(frame->white_point) !=
+		     sizeof(hdr_metadata->hdmi_metadata_type1.white_point));
+
+	memcpy(&frame->display_primaries,
+	       &hdr_metadata->hdmi_metadata_type1.display_primaries,
+	       sizeof(frame->display_primaries));
+
+	memcpy(&frame->white_point,
+	       &hdr_metadata->hdmi_metadata_type1.white_point,
+	       sizeof(frame->white_point));
+
+	frame->max_display_mastering_luminance =
+		hdr_metadata->hdmi_metadata_type1.max_display_mastering_luminance;
+	frame->min_display_mastering_luminance =
+		hdr_metadata->hdmi_metadata_type1.min_display_mastering_luminance;
+	frame->max_fall = hdr_metadata->hdmi_metadata_type1.max_fall;
+	frame->max_cll = hdr_metadata->hdmi_metadata_type1.max_cll;
+
+	return 0;
+}
+EXPORT_SYMBOL(drm_hdmi_infoframe_set_hdr_metadata);
+
 /**
  * drm_hdmi_avi_infoframe_from_display_mode() - fill an HDMI AVI infoframe with
  *                                              data from a DRM display mode
diff --git a/drivers/video/hdmi.c b/drivers/video/hdmi.c
index 799ae49..481f036 100644
--- a/drivers/video/hdmi.c
+++ b/drivers/video/hdmi.c
@@ -650,6 +650,150 @@ ssize_t hdmi_vendor_infoframe_pack(struct hdmi_vendor_infoframe *frame,
 	return 0;
 }
 
+/**
+ * hdmi_drm_infoframe_init() - initialize an HDMI Dynaminc Range and
+ * mastering infoframe
+ * @frame: HDMI DRM infoframe
+ *
+ * Returns 0 on success or a negative error code on failure.
+ */
+int hdmi_drm_infoframe_init(struct hdmi_drm_infoframe *frame)
+{
+	memset(frame, 0, sizeof(*frame));
+
+	frame->type = HDMI_INFOFRAME_TYPE_DRM;
+	frame->version = 1;
+	frame->length = HDMI_DRM_INFOFRAME_SIZE;
+
+	return 0;
+}
+EXPORT_SYMBOL(hdmi_drm_infoframe_init);
+
+static int hdmi_drm_infoframe_check_only(const struct hdmi_drm_infoframe *frame)
+{
+	if (frame->type != HDMI_INFOFRAME_TYPE_DRM ||
+	    frame->version != 1)
+		return -EINVAL;
+
+	if (frame->length != HDMI_DRM_INFOFRAME_SIZE)
+		return -EINVAL;
+
+	return 0;
+}
+
+/**
+ * hdmi_drm_infoframe_check() - check a HDMI DRM infoframe
+ * @frame: HDMI DRM infoframe
+ *
+ * Validates that the infoframe is consistent.
+ * Returns 0 on success or a negative error code on failure.
+ */
+int hdmi_drm_infoframe_check(struct hdmi_drm_infoframe *frame)
+{
+	return hdmi_drm_infoframe_check_only(frame);
+}
+EXPORT_SYMBOL(hdmi_drm_infoframe_check);
+
+/**
+ * hdmi_drm_infoframe_pack_only() - write HDMI DRM infoframe to binary buffer
+ * @frame: HDMI DRM infoframe
+ * @buffer: destination buffer
+ * @size: size of buffer
+ *
+ * Packs the information contained in the @frame structure into a binary
+ * representation that can be written into the corresponding controller
+ * registers. Also computes the checksum as required by section 5.3.5 of
+ * the HDMI 1.4 specification.
+ *
+ * Returns the number of bytes packed into the binary buffer or a negative
+ * error code on failure.
+ */
+ssize_t hdmi_drm_infoframe_pack_only(const struct hdmi_drm_infoframe *frame,
+				     void *buffer, size_t size)
+{
+	u8 *ptr = buffer;
+	size_t length;
+	int i;
+
+	length = HDMI_INFOFRAME_HEADER_SIZE + frame->length;
+
+	if (size < length)
+		return -ENOSPC;
+
+	memset(buffer, 0, size);
+
+	ptr[0] = frame->type;
+	ptr[1] = frame->version;
+	ptr[2] = frame->length;
+	ptr[3] = 0; /* checksum */
+
+	/* start infoframe payload */
+	ptr += HDMI_INFOFRAME_HEADER_SIZE;
+
+	*ptr++ = frame->eotf;
+	*ptr++ = frame->metadata_type;
+
+	for (i = 0; i < 3; i++) {
+		*ptr++ = frame->display_primaries[i].x;
+		*ptr++ = frame->display_primaries[i].x >> 8;
+		*ptr++ = frame->display_primaries[i].y;
+		*ptr++ = frame->display_primaries[i].y >> 8;
+	}
+
+	*ptr++ = frame->white_point.x;
+	*ptr++ = frame->white_point.x >> 8;
+
+	*ptr++ = frame->white_point.y;
+	*ptr++ = frame->white_point.y >> 8;
+
+	*ptr++ = frame->max_display_mastering_luminance;
+	*ptr++ = frame->max_display_mastering_luminance >> 8;
+
+	*ptr++ = frame->min_display_mastering_luminance;
+	*ptr++ = frame->min_display_mastering_luminance >> 8;
+
+	*ptr++ = frame->max_cll;
+	*ptr++ = frame->max_cll >> 8;
+
+	*ptr++ = frame->max_fall;
+	*ptr++ = frame->max_fall >> 8;
+
+	hdmi_infoframe_set_checksum(buffer, length);
+
+	return length;
+}
+EXPORT_SYMBOL(hdmi_drm_infoframe_pack_only);
+
+/**
+ * hdmi_drm_infoframe_pack() - check a HDMI DRM infoframe,
+ *                             and write it to binary buffer
+ * @frame: HDMI DRM infoframe
+ * @buffer: destination buffer
+ * @size: size of buffer
+ *
+ * Validates that the infoframe is consistent and updates derived fields
+ * (eg. length) based on other fields, after which it packs the information
+ * contained in the @frame structure into a binary representation that
+ * can be written into the corresponding controller registers. This function
+ * also computes the checksum as required by section 5.3.5 of the HDMI 1.4
+ * specification.
+ *
+ * Returns the number of bytes packed into the binary buffer or a negative
+ * error code on failure.
+ */
+ssize_t hdmi_drm_infoframe_pack(struct hdmi_drm_infoframe *frame,
+				void *buffer, size_t size)
+{
+	int ret;
+
+	ret = hdmi_drm_infoframe_check(frame);
+	if (ret)
+		return ret;
+
+	return hdmi_drm_infoframe_pack_only(frame, buffer, size);
+}
+EXPORT_SYMBOL(hdmi_drm_infoframe_pack);
+
 /*
  * hdmi_vendor_any_infoframe_check() - check a vendor infoframe
  */
@@ -758,6 +902,10 @@ ssize_t hdmi_vendor_infoframe_pack(struct hdmi_vendor_infoframe *frame,
 		length = hdmi_avi_infoframe_pack_only(&frame->avi,
 						      buffer, size);
 		break;
+	case HDMI_INFOFRAME_TYPE_DRM:
+		length = hdmi_drm_infoframe_pack_only(&frame->drm,
+						      buffer, size);
+		break;
 	case HDMI_INFOFRAME_TYPE_SPD:
 		length = hdmi_spd_infoframe_pack_only(&frame->spd,
 						      buffer, size);
@@ -806,6 +954,9 @@ ssize_t hdmi_vendor_infoframe_pack(struct hdmi_vendor_infoframe *frame,
 	case HDMI_INFOFRAME_TYPE_AVI:
 		length = hdmi_avi_infoframe_pack(&frame->avi, buffer, size);
 		break;
+	case HDMI_INFOFRAME_TYPE_DRM:
+		length = hdmi_drm_infoframe_pack(&frame->drm, buffer, size);
+		break;
 	case HDMI_INFOFRAME_TYPE_SPD:
 		length = hdmi_spd_infoframe_pack(&frame->spd, buffer, size);
 		break;
@@ -838,6 +989,8 @@ static const char *hdmi_infoframe_type_get_name(enum hdmi_infoframe_type type)
 		return "Source Product Description (SPD)";
 	case HDMI_INFOFRAME_TYPE_AUDIO:
 		return "Audio";
+	case HDMI_INFOFRAME_TYPE_DRM:
+		return "Dynamic Range and Mastering";
 	}
 	return "Reserved";
 }
@@ -1284,6 +1437,40 @@ static void hdmi_audio_infoframe_log(const char *level,
 			frame->downmix_inhibit ? "Yes" : "No");
 }
 
+/**
+ * hdmi_drm_infoframe_log() - log info of HDMI DRM infoframe
+ * @level: logging level
+ * @dev: device
+ * @frame: HDMI DRM infoframe
+ */
+static void hdmi_drm_infoframe_log(const char *level,
+				   struct device *dev,
+				   const struct hdmi_drm_infoframe *frame)
+{
+	int i;
+
+	hdmi_infoframe_log_header(level, dev,
+				  (struct hdmi_any_infoframe *)frame);
+	hdmi_log("length: %d\n", frame->length);
+	hdmi_log("metadata type: %d\n", frame->metadata_type);
+	hdmi_log("eotf: %d\n", frame->eotf);
+	for (i = 0; i < 3; i++) {
+		hdmi_log("x[%d]: %d\n", i, frame->display_primaries[i].x);
+		hdmi_log("y[%d]: %d\n", i, frame->display_primaries[i].y);
+	}
+
+	hdmi_log("white point x: %d\n", frame->white_point.x);
+	hdmi_log("white point y: %d\n", frame->white_point.y);
+
+	hdmi_log("max_display_mastering_luminance: %d\n",
+		 frame->max_display_mastering_luminance);
+	hdmi_log("min_display_mastering_luminance: %d\n",
+		 frame->min_display_mastering_luminance);
+
+	hdmi_log("max_cll: %d\n", frame->max_cll);
+	hdmi_log("max_fall: %d\n", frame->max_fall);
+}
+
 static const char *
 hdmi_3d_structure_get_name(enum hdmi_3d_structure s3d_struct)
 {
@@ -1372,6 +1559,9 @@ void hdmi_infoframe_log(const char *level,
 	case HDMI_INFOFRAME_TYPE_VENDOR:
 		hdmi_vendor_any_infoframe_log(level, dev, &frame->vendor);
 		break;
+	case HDMI_INFOFRAME_TYPE_DRM:
+		hdmi_drm_infoframe_log(level, dev, &frame->drm);
+		break;
 	}
 }
 EXPORT_SYMBOL(hdmi_infoframe_log);
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
index 9d3b5b9..0e21e91 100644
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -25,6 +25,7 @@
 
 #include <linux/types.h>
 #include <linux/hdmi.h>
+#include <drm/drm_mode.h>
 
 struct drm_device;
 struct i2c_adapter;
@@ -370,6 +371,10 @@ int drm_av_sync_delay(struct drm_connector *connector,
 				   const struct drm_display_mode *mode,
 				   enum hdmi_quantization_range rgb_quant_range);
 
+int
+drm_hdmi_infoframe_set_hdr_metadata(struct hdmi_drm_infoframe *frame,
+				    const struct drm_connector_state *conn_state);
+
 /**
  * drm_eld_mnl - Get ELD monitor name length in bytes.
  * @eld: pointer to an eld memory structure with mnl set
diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h
index 6780476..bcf3c6c 100644
--- a/include/linux/hdmi.h
+++ b/include/linux/hdmi.h
@@ -47,6 +47,7 @@ enum hdmi_infoframe_type {
 	HDMI_INFOFRAME_TYPE_AVI = 0x82,
 	HDMI_INFOFRAME_TYPE_SPD = 0x83,
 	HDMI_INFOFRAME_TYPE_AUDIO = 0x84,
+	HDMI_INFOFRAME_TYPE_DRM = 0x87,
 };
 
 #define HDMI_IEEE_OUI 0x000c03
@@ -55,6 +56,7 @@ enum hdmi_infoframe_type {
 #define HDMI_AVI_INFOFRAME_SIZE    13
 #define HDMI_SPD_INFOFRAME_SIZE    25
 #define HDMI_AUDIO_INFOFRAME_SIZE  10
+#define HDMI_DRM_INFOFRAME_SIZE    26
 
 #define HDMI_INFOFRAME_SIZE(type)	\
 	(HDMI_INFOFRAME_HEADER_SIZE + HDMI_ ## type ## _INFOFRAME_SIZE)
@@ -185,12 +187,37 @@ struct hdmi_avi_infoframe {
 	unsigned short right_bar;
 };
 
+/* DRM Infoframe as per CTA 861.G spec */
+struct hdmi_drm_infoframe {
+	enum hdmi_infoframe_type type;
+	unsigned char version;
+	unsigned char length;
+	enum hdmi_eotf eotf;
+	enum hdmi_metadata_type metadata_type;
+	struct {
+		u16 x, y;
+	} display_primaries[3];
+	struct {
+		u16 x, y;
+	} white_point;
+	u16 max_display_mastering_luminance;
+	u16 min_display_mastering_luminance;
+	u16 max_cll;
+	u16 max_fall;
+};
+
 int hdmi_avi_infoframe_init(struct hdmi_avi_infoframe *frame);
 ssize_t hdmi_avi_infoframe_pack(struct hdmi_avi_infoframe *frame, void *buffer,
 				size_t size);
 ssize_t hdmi_avi_infoframe_pack_only(const struct hdmi_avi_infoframe *frame,
 				     void *buffer, size_t size);
 int hdmi_avi_infoframe_check(struct hdmi_avi_infoframe *frame);
+int hdmi_drm_infoframe_init(struct hdmi_drm_infoframe *frame);
+ssize_t hdmi_drm_infoframe_pack(struct hdmi_drm_infoframe *frame, void *buffer,
+				size_t size);
+ssize_t hdmi_drm_infoframe_pack_only(const struct hdmi_drm_infoframe *frame,
+				     void *buffer, size_t size);
+int hdmi_drm_infoframe_check(struct hdmi_drm_infoframe *frame);
 
 enum hdmi_spd_sdi {
 	HDMI_SPD_SDI_UNKNOWN,
@@ -381,6 +408,7 @@ ssize_t hdmi_vendor_infoframe_pack_only(const struct hdmi_vendor_infoframe *fram
 	struct hdmi_spd_infoframe spd;
 	union hdmi_vendor_any_infoframe vendor;
 	struct hdmi_audio_infoframe audio;
+	struct hdmi_drm_infoframe drm;
 };
 
 ssize_t hdmi_infoframe_pack(union hdmi_infoframe *frame, void *buffer,
-- 
1.9.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [v11 05/12] drm/i915: Attach HDR metadata property to connector
  2019-05-16 14:10 [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
                   ` (3 preceding siblings ...)
  2019-05-16 14:10 ` [v11 04/12] drm: Enable HDR infoframe support Uma Shankar
@ 2019-05-16 14:10 ` Uma Shankar
  2019-05-17 14:06   ` Ville Syrjälä
  2019-05-16 14:10 ` [v11 06/12] drm/i915: Write HDR infoframe and send to panel Uma Shankar
                   ` (17 subsequent siblings)
  22 siblings, 1 reply; 40+ messages in thread
From: Uma Shankar @ 2019-05-16 14:10 UTC (permalink / raw)
  To: intel-gfx, dri-devel; +Cc: dcastagna, jonas, seanpaul

Attach HDR metadata property to connector object.

v2: Rebase

v3: Updated the property name as per updated name
while creating hdr metadata property

Signed-off-by: Uma Shankar <uma.shankar@intel.com>
Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
---
 drivers/gpu/drm/i915/intel_hdmi.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 2a4086c..92597d8 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -2724,6 +2724,8 @@ static void intel_hdmi_destroy(struct drm_connector *connector)
 
 	drm_connector_attach_content_type_property(connector);
 	connector->state->picture_aspect_ratio = HDMI_PICTURE_ASPECT_NONE;
+	drm_object_attach_property(&connector->base,
+				   connector->dev->mode_config.hdr_output_metadata_property, 0);
 
 	if (!HAS_GMCH(dev_priv))
 		drm_connector_attach_max_bpc_property(connector, 8, 12);
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [v11 06/12] drm/i915: Write HDR infoframe and send to panel
  2019-05-16 14:10 [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
                   ` (4 preceding siblings ...)
  2019-05-16 14:10 ` [v11 05/12] drm/i915: Attach HDR metadata property to connector Uma Shankar
@ 2019-05-16 14:10 ` Uma Shankar
  2019-05-17 14:06   ` Ville Syrjälä
  2019-05-16 14:10 ` [v11 07/12] drm: Add HLG EOTF Uma Shankar
                   ` (16 subsequent siblings)
  22 siblings, 1 reply; 40+ messages in thread
From: Uma Shankar @ 2019-05-16 14:10 UTC (permalink / raw)
  To: intel-gfx, dri-devel; +Cc: dcastagna, jonas, seanpaul

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.

v6: Addressed Shashank's review comment. Added HDR metadata
support from GEN10 onwards as per Shashank's recommendation.

v7: Addressed Shashank's review comments

v8: Added Shashank's RB.

v9: Addressed Ville's review comments.

Signed-off-by: Uma Shankar <uma.shankar@intel.com>
Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
---
 drivers/gpu/drm/i915/intel_drv.h  |  1 +
 drivers/gpu/drm/i915/intel_hdmi.c | 44 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 5258abb..40e2c52 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -910,6 +910,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 92597d8..d3b8e09 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -573,6 +573,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)
@@ -795,6 +796,41 @@ 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 drm_i915_private *dev_priv = to_i915(encoder->base.dev);
+	int ret;
+
+	if (!(INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)))
+		return true;
+
+	if (!crtc_state->has_infoframe)
+		return true;
+
+	if (!conn_state->hdr_output_metadata ||
+	    conn_state->hdr_output_metadata->length == 0)
+		return true;
+
+	crtc_state->infoframes.enable |=
+		intel_hdmi_infoframe_enable(HDMI_INFOFRAME_TYPE_DRM);
+
+	ret = drm_hdmi_infoframe_set_hdr_metadata(frame, conn_state);
+	if (ret < 0) {
+		DRM_ERROR("couldn't set HDR metadata in infoframe\n");
+		return false;
+	}
+
+	ret = hdmi_drm_infoframe_check(frame);
+	if (WARN_ON(ret))
+		return false;
+
+	return true;
+}
+
 static void g4x_set_infoframes(struct intel_encoder *encoder,
 			       bool enable,
 			       const struct intel_crtc_state *crtc_state,
@@ -1180,6 +1216,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)
@@ -2386,6 +2425,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;
 }
 
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [v11 07/12] drm: Add HLG EOTF
  2019-05-16 14:10 [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
                   ` (5 preceding siblings ...)
  2019-05-16 14:10 ` [v11 06/12] drm/i915: Write HDR infoframe and send to panel Uma Shankar
@ 2019-05-16 14:10 ` Uma Shankar
  2019-05-16 14:10 ` [v11 08/12] drm/i915: Enable infoframes on GLK+ for HDR Uma Shankar
                   ` (15 subsequent siblings)
  22 siblings, 0 replies; 40+ messages in thread
From: Uma Shankar @ 2019-05-16 14:10 UTC (permalink / raw)
  To: intel-gfx, dri-devel; +Cc: dcastagna, jonas, seanpaul

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

ADD HLG EOTF to the list of EOTF transfer functions supported.
Hybrid Log-Gamma (HLG) is a high dynamic range (HDR) standard.
HLG defines a nonlinear transfer function in which the lower
half of the signal values use a gamma curve and the upper half
of the signal values use a logarithmic curve.

v2: Rebase

v3: Fixed a warning message

v4: Addressed Shashank's review comments

v5: Addressed Jonas Karlman's review comment and dropped the i915
tag from header.

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

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 73560c9..262510c 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -3854,7 +3854,8 @@ static uint8_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 uint8_t hdr_metadata_type(const u8 *edid_ext)
diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h
index bcf3c6c..ee55ba5 100644
--- a/include/linux/hdmi.h
+++ b/include/linux/hdmi.h
@@ -162,6 +162,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 {
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [v11 08/12] drm/i915: Enable infoframes on GLK+ for HDR
  2019-05-16 14:10 [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
                   ` (6 preceding siblings ...)
  2019-05-16 14:10 ` [v11 07/12] drm: Add HLG EOTF Uma Shankar
@ 2019-05-16 14:10 ` Uma Shankar
  2019-05-17 14:01   ` Ville Syrjälä
  2019-05-16 14:10 ` [v11 09/12] drm/i915:Enabled Modeset when HDR Infoframe changes Uma Shankar
                   ` (14 subsequent siblings)
  22 siblings, 1 reply; 40+ messages in thread
From: Uma Shankar @ 2019-05-16 14:10 UTC (permalink / raw)
  To: intel-gfx, dri-devel; +Cc: dcastagna, jonas, seanpaul

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

This patch enables infoframes on GLK+ to be
used to send HDR metadata to HDMI sink.

v2: Addressed Shashank's review comment.

v3: Addressed Shashank's review comment.

v4: Added Shashank's RB.

v5: Dropped hdr_metadata_change check while modeset, as per
Ville's suggestion.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
---
 drivers/gpu/drm/i915/i915_reg.h   |  4 ++++
 drivers/gpu/drm/i915/intel_hdmi.c | 19 +++++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index e97c47f..d3f5510 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -4694,6 +4694,7 @@ enum {
 #define   VIDEO_DIP_FREQ_MASK		(3 << 16)
 /* HSW and later: */
 #define   DRM_DIP_ENABLE		(1 << 28)
+#define   VIDEO_DIP_ENABLE_DRM_GLK	(1 << 28)
 #define   PSR_VSC_BIT_7_SET		(1 << 27)
 #define   VSC_SELECT_MASK		(0x3 << 25)
 #define   VSC_SELECT_SHIFT		25
@@ -8146,6 +8147,7 @@ enum {
 #define _HSW_VIDEO_DIP_SPD_DATA_A	0x602A0
 #define _HSW_VIDEO_DIP_GMP_DATA_A	0x602E0
 #define _HSW_VIDEO_DIP_VSC_DATA_A	0x60320
+#define _GLK_VIDEO_DIP_DRM_DATA_A	0x60440
 #define _HSW_VIDEO_DIP_AVI_ECC_A	0x60240
 #define _HSW_VIDEO_DIP_VS_ECC_A		0x60280
 #define _HSW_VIDEO_DIP_SPD_ECC_A	0x602C0
@@ -8159,6 +8161,7 @@ enum {
 #define _HSW_VIDEO_DIP_SPD_DATA_B	0x612A0
 #define _HSW_VIDEO_DIP_GMP_DATA_B	0x612E0
 #define _HSW_VIDEO_DIP_VSC_DATA_B	0x61320
+#define _GLK_VIDEO_DIP_DRM_DATA_B	0x61440
 #define _HSW_VIDEO_DIP_BVI_ECC_B	0x61240
 #define _HSW_VIDEO_DIP_VS_ECC_B		0x61280
 #define _HSW_VIDEO_DIP_SPD_ECC_B	0x612C0
@@ -8184,6 +8187,7 @@ enum {
 #define HSW_TVIDEO_DIP_SPD_DATA(trans, i)	_MMIO_TRANS2(trans, _HSW_VIDEO_DIP_SPD_DATA_A + (i) * 4)
 #define HSW_TVIDEO_DIP_GMP_DATA(trans, i)	_MMIO_TRANS2(trans, _HSW_VIDEO_DIP_GMP_DATA_A + (i) * 4)
 #define HSW_TVIDEO_DIP_VSC_DATA(trans, i)	_MMIO_TRANS2(trans, _HSW_VIDEO_DIP_VSC_DATA_A + (i) * 4)
+#define GLK_TVIDEO_DIP_DRM_DATA(trans, i)	_MMIO_TRANS2(trans, _GLK_VIDEO_DIP_DRM_DATA_A + (i) * 4)
 #define ICL_VIDEO_DIP_PPS_DATA(trans, i)	_MMIO_TRANS2(trans, _ICL_VIDEO_DIP_PPS_DATA_A + (i) * 4)
 #define ICL_VIDEO_DIP_PPS_ECC(trans, i)		_MMIO_TRANS2(trans, _ICL_VIDEO_DIP_PPS_ECC_A + (i) * 4)
 
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index d3b8e09..8bd7c07 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -152,6 +152,8 @@ static u32 hsw_infoframe_enable(unsigned int type)
 		return VIDEO_DIP_ENABLE_SPD_HSW;
 	case HDMI_INFOFRAME_TYPE_VENDOR:
 		return VIDEO_DIP_ENABLE_VS_HSW;
+	case HDMI_INFOFRAME_TYPE_DRM:
+		return VIDEO_DIP_ENABLE_DRM_GLK;
 	default:
 		MISSING_CASE(type);
 		return 0;
@@ -177,6 +179,8 @@ static u32 hsw_infoframe_enable(unsigned int type)
 		return HSW_TVIDEO_DIP_SPD_DATA(cpu_transcoder, i);
 	case HDMI_INFOFRAME_TYPE_VENDOR:
 		return HSW_TVIDEO_DIP_VS_DATA(cpu_transcoder, i);
+	case HDMI_INFOFRAME_TYPE_DRM:
+		return GLK_TVIDEO_DIP_DRM_DATA(cpu_transcoder, i);
 	default:
 		MISSING_CASE(type);
 		return INVALID_MMIO_REG;
@@ -560,10 +564,16 @@ static u32 hsw_infoframes_enabled(struct intel_encoder *encoder,
 {
 	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
 	u32 val = I915_READ(HSW_TVIDEO_DIP_CTL(pipe_config->cpu_transcoder));
+	u32 mask;
 
-	return val & (VIDEO_DIP_ENABLE_VSC_HSW | VIDEO_DIP_ENABLE_AVI_HSW |
-		      VIDEO_DIP_ENABLE_GCP_HSW | VIDEO_DIP_ENABLE_VS_HSW |
-		      VIDEO_DIP_ENABLE_GMP_HSW | VIDEO_DIP_ENABLE_SPD_HSW);
+	mask = (VIDEO_DIP_ENABLE_VSC_HSW | VIDEO_DIP_ENABLE_AVI_HSW |
+		VIDEO_DIP_ENABLE_GCP_HSW | VIDEO_DIP_ENABLE_VS_HSW |
+		VIDEO_DIP_ENABLE_GMP_HSW | VIDEO_DIP_ENABLE_SPD_HSW);
+
+	if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
+		mask |= VIDEO_DIP_ENABLE_DRM_GLK;
+
+	return val & mask;
 }
 
 static const u8 infoframe_type_to_idx[] = {
@@ -1193,7 +1203,8 @@ static void hsw_set_infoframes(struct intel_encoder *encoder,
 
 	val &= ~(VIDEO_DIP_ENABLE_VSC_HSW | VIDEO_DIP_ENABLE_AVI_HSW |
 		 VIDEO_DIP_ENABLE_GCP_HSW | VIDEO_DIP_ENABLE_VS_HSW |
-		 VIDEO_DIP_ENABLE_GMP_HSW | VIDEO_DIP_ENABLE_SPD_HSW);
+		 VIDEO_DIP_ENABLE_GMP_HSW | VIDEO_DIP_ENABLE_SPD_HSW |
+		 VIDEO_DIP_ENABLE_DRM_GLK);
 
 	if (!enable) {
 		I915_WRITE(reg, val);
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [v11 09/12] drm/i915:Enabled Modeset when HDR Infoframe changes
  2019-05-16 14:10 [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
                   ` (7 preceding siblings ...)
  2019-05-16 14:10 ` [v11 08/12] drm/i915: Enable infoframes on GLK+ for HDR Uma Shankar
@ 2019-05-16 14:10 ` Uma Shankar
  2019-05-16 14:10 ` [v11 10/12] drm/i915: Added DRM Infoframe handling for BYT/CHT Uma Shankar
                   ` (13 subsequent siblings)
  22 siblings, 0 replies; 40+ messages in thread
From: Uma Shankar @ 2019-05-16 14:10 UTC (permalink / raw)
  To: intel-gfx, dri-devel; +Cc: dcastagna, jonas, seanpaul

This patch enables modeset whenever HDR metadata
needs to be updated to sink.

v2: Addressed Shashank's review comments.

v3: Added Shashank's RB.

v4: Addressed Ville's review comments.

v5: Addressed Ville's review comments.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
---
 drivers/gpu/drm/i915/intel_atomic.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c
index 58b8049..6b985e8 100644
--- a/drivers/gpu/drm/i915/intel_atomic.c
+++ b/drivers/gpu/drm/i915/intel_atomic.c
@@ -105,6 +105,16 @@ int intel_digital_connector_atomic_set_property(struct drm_connector *connector,
 	return -EINVAL;
 }
 
+static bool blob_equal(const struct drm_property_blob *a,
+		       const struct drm_property_blob *b)
+{
+	if (a && b)
+		return a->length == b->length &&
+			!memcmp(a->data, b->data, a->length);
+
+	return !a == !b;
+}
+
 int intel_digital_connector_atomic_check(struct drm_connector *conn,
 					 struct drm_connector_state *new_state)
 {
@@ -132,7 +142,9 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn,
 	    new_conn_state->base.colorspace != old_conn_state->base.colorspace ||
 	    new_conn_state->base.picture_aspect_ratio != old_conn_state->base.picture_aspect_ratio ||
 	    new_conn_state->base.content_type != old_conn_state->base.content_type ||
-	    new_conn_state->base.scaling_mode != old_conn_state->base.scaling_mode)
+	    new_conn_state->base.scaling_mode != old_conn_state->base.scaling_mode ||
+	    !blob_equal(new_conn_state->base.hdr_output_metadata,
+			old_conn_state->base.hdr_output_metadata))
 		crtc_state->mode_changed = true;
 
 	return 0;
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [v11 10/12] drm/i915: Added DRM Infoframe handling for BYT/CHT
  2019-05-16 14:10 [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
                   ` (8 preceding siblings ...)
  2019-05-16 14:10 ` [v11 09/12] drm/i915:Enabled Modeset when HDR Infoframe changes Uma Shankar
@ 2019-05-16 14:10 ` Uma Shankar
  2019-05-16 14:10 ` [v11 11/12] video/hdmi: Add Unpack function for DRM infoframe Uma Shankar
                   ` (12 subsequent siblings)
  22 siblings, 0 replies; 40+ messages in thread
From: Uma Shankar @ 2019-05-16 14:10 UTC (permalink / raw)
  To: intel-gfx, dri-devel; +Cc: dcastagna, jonas, seanpaul

BYT/CHT doesn't support DRM Infoframe. This caused
a WARN_ON due to a missing CASE while executing
intel_hdmi_infoframes_enabled function. This patch
fixes the same.

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

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 8bd7c07..90e0587 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -129,6 +129,8 @@ static u32 g4x_infoframe_enable(unsigned int type)
 		return VIDEO_DIP_ENABLE_SPD;
 	case HDMI_INFOFRAME_TYPE_VENDOR:
 		return VIDEO_DIP_ENABLE_VENDOR;
+	case HDMI_INFOFRAME_TYPE_DRM:
+		return 0;
 	default:
 		MISSING_CASE(type);
 		return 0;
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [v11 11/12] video/hdmi: Add Unpack function for DRM infoframe
  2019-05-16 14:10 [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
                   ` (9 preceding siblings ...)
  2019-05-16 14:10 ` [v11 10/12] drm/i915: Added DRM Infoframe handling for BYT/CHT Uma Shankar
@ 2019-05-16 14:10 ` Uma Shankar
  2019-05-16 14:10 ` [v11 12/12] drm/i915: Add state readout " Uma Shankar
                   ` (11 subsequent siblings)
  22 siblings, 0 replies; 40+ messages in thread
From: Uma Shankar @ 2019-05-16 14:10 UTC (permalink / raw)
  To: intel-gfx, dri-devel
  Cc: dcastagna, jonas, emil.l.velikov, Uma Shankar, seanpaul

Added unpack function for DRM infoframe for dynamic
range and mastering infoframe readout.

v2: Addressed Ville's review comments.

Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
---
 drivers/video/hdmi.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/drivers/video/hdmi.c b/drivers/video/hdmi.c
index 481f036..b99ba01 100644
--- a/drivers/video/hdmi.c
+++ b/drivers/video/hdmi.c
@@ -1805,6 +1805,70 @@ static int hdmi_audio_infoframe_unpack(struct hdmi_audio_infoframe *frame,
 }
 
 /**
+ * hdmi_drm_infoframe_unpack() - unpack binary buffer to a HDMI DRM infoframe
+ * @frame: HDMI DRM infoframe
+ * @buffer: source buffer
+ * @size: size of buffer
+ *
+ * Unpacks the information contained in binary @buffer into a structured
+ * @frame of the HDMI Dynamic Range and Mastering (DRM) information frame.
+ * Also verifies the checksum as required by section 5.3.5 of the HDMI 1.4
+ * specification.
+ *
+ * Returns 0 on success or a negative error code on failure.
+ */
+static int hdmi_drm_infoframe_unpack(struct hdmi_drm_infoframe *frame,
+				     const void *buffer, size_t size)
+{
+	const u8 *ptr = buffer;
+	const u8 *temp;
+	u8 x_lsb, x_msb;
+	u8 y_lsb, y_msb;
+	int ret;
+	int i;
+
+	if (size < HDMI_INFOFRAME_SIZE(DRM))
+		return -EINVAL;
+
+	if (ptr[0] != HDMI_INFOFRAME_TYPE_DRM ||
+	    ptr[1] != 1 ||
+	    ptr[2] != HDMI_DRM_INFOFRAME_SIZE)
+		return -EINVAL;
+
+	if (hdmi_infoframe_checksum(buffer, HDMI_INFOFRAME_SIZE(DRM)) != 0)
+		return -EINVAL;
+
+	ret = hdmi_drm_infoframe_init(frame);
+	if (ret)
+		return ret;
+
+	ptr += HDMI_INFOFRAME_HEADER_SIZE;
+
+	frame->eotf = ptr[0] & 0x7;
+	frame->metadata_type = ptr[1] & 0x7;
+
+	temp = ptr + 2;
+	for (i = 0; i < 3; i++) {
+		x_lsb = *temp++;
+		x_msb = *temp++;
+		frame->display_primaries[i].x =  (x_msb << 8) | x_lsb;
+		y_lsb = *temp++;
+		y_msb = *temp++;
+		frame->display_primaries[i].y = (y_msb << 8) | y_lsb;
+	}
+
+	frame->white_point.x = (ptr[15] << 8) | ptr[14];
+	frame->white_point.y = (ptr[17] << 8) | ptr[16];
+
+	frame->max_display_mastering_luminance = (ptr[19] << 8) | ptr[18];
+	frame->min_display_mastering_luminance = (ptr[21] << 8) | ptr[20];
+	frame->max_cll = (ptr[23] << 8) | ptr[22];
+	frame->max_fall = (ptr[25] << 8) | ptr[24];
+
+	return 0;
+}
+
+/**
  * hdmi_infoframe_unpack() - unpack binary buffer to a HDMI infoframe
  * @frame: HDMI infoframe
  * @buffer: source buffer
@@ -1830,6 +1894,9 @@ int hdmi_infoframe_unpack(union hdmi_infoframe *frame,
 	case HDMI_INFOFRAME_TYPE_AVI:
 		ret = hdmi_avi_infoframe_unpack(&frame->avi, buffer, size);
 		break;
+	case HDMI_INFOFRAME_TYPE_DRM:
+		ret = hdmi_drm_infoframe_unpack(&frame->drm, buffer, size);
+		break;
 	case HDMI_INFOFRAME_TYPE_SPD:
 		ret = hdmi_spd_infoframe_unpack(&frame->spd, buffer, size);
 		break;
-- 
1.9.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [v11 12/12] drm/i915: Add state readout for DRM infoframe
  2019-05-16 14:10 [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
                   ` (10 preceding siblings ...)
  2019-05-16 14:10 ` [v11 11/12] video/hdmi: Add Unpack function for DRM infoframe Uma Shankar
@ 2019-05-16 14:10 ` Uma Shankar
  2019-05-16 14:12 ` ✗ Fi.CI.CHECKPATCH: warning for Add HDR Metadata Parsing and handling in DRM layer (rev11) Patchwork
                   ` (10 subsequent siblings)
  22 siblings, 0 replies; 40+ messages in thread
From: Uma Shankar @ 2019-05-16 14:10 UTC (permalink / raw)
  To: intel-gfx, dri-devel; +Cc: dcastagna, jonas, seanpaul

Added state readout for DRM infoframe and enabled
state validation for DRM infoframe.

v2: Addressed Ville's review comments and dropped the
unused drm infoframe read at intel_hdmi_init.

v3: Removed a redundant platform check as per Ville's
comment.

Signed-off-by: Uma Shankar <uma.shankar@intel.com>
---
 drivers/gpu/drm/i915/intel_ddi.c     | 3 +++
 drivers/gpu/drm/i915/intel_display.c | 1 +
 2 files changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 0af47f3..c789de9 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -3834,6 +3834,9 @@ void intel_ddi_get_config(struct intel_encoder *encoder,
 	intel_read_infoframe(encoder, pipe_config,
 			     HDMI_INFOFRAME_TYPE_VENDOR,
 			     &pipe_config->infoframes.hdmi);
+	intel_read_infoframe(encoder, pipe_config,
+			     HDMI_INFOFRAME_TYPE_DRM,
+			     &pipe_config->infoframes.drm);
 }
 
 static enum intel_output_type
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index e35ba8d..c89b214 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12274,6 +12274,7 @@ static bool fastboot_enabled(struct drm_i915_private *dev_priv)
 	PIPE_CONF_CHECK_INFOFRAME(avi);
 	PIPE_CONF_CHECK_INFOFRAME(spd);
 	PIPE_CONF_CHECK_INFOFRAME(hdmi);
+	PIPE_CONF_CHECK_INFOFRAME(drm);
 
 #undef PIPE_CONF_CHECK_X
 #undef PIPE_CONF_CHECK_I
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 40+ messages in thread

* ✗ Fi.CI.CHECKPATCH: warning for Add HDR Metadata Parsing and handling in DRM layer (rev11)
  2019-05-16 14:10 [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
                   ` (11 preceding siblings ...)
  2019-05-16 14:10 ` [v11 12/12] drm/i915: Add state readout " Uma Shankar
@ 2019-05-16 14:12 ` Patchwork
  2019-05-16 14:37 ` ✓ Fi.CI.BAT: success " Patchwork
                   ` (9 subsequent siblings)
  22 siblings, 0 replies; 40+ messages in thread
From: Patchwork @ 2019-05-16 14:12 UTC (permalink / raw)
  To: Uma Shankar; +Cc: intel-gfx

== Series Details ==

Series: Add HDR Metadata Parsing and handling in DRM layer (rev11)
URL   : https://patchwork.freedesktop.org/series/25091/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
c372f3162e09 drm: Add HDR source metadata property
-:62: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#62: FILE: drivers/gpu/drm/drm_atomic_uapi.c:733:
+		ret = drm_atomic_replace_property_blob_from_id(dev,
+				&state->hdr_output_metadata,

total: 0 errors, 0 warnings, 1 checks, 144 lines checked
4d08742fedee drm: Add reference counting on HDR metadata blob
b95d51f65c44 drm: Parse HDR metadata info from EDID
736754715323 drm: Enable HDR infoframe support
-:92: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#92: FILE: drivers/gpu/drm/drm_edid.c:4943:
+	if (!is_eotf_supported(hdr_metadata->hdmi_metadata_type1.eotf,
+	    connector->hdr_sink_metadata.hdmi_type1.eotf)) {

total: 0 errors, 0 warnings, 1 checks, 379 lines checked
495dfdf065ff drm/i915: Attach HDR metadata property to connector
77b052459da8 drm/i915: Write HDR infoframe and send to panel
538cf737007c drm: Add HLG EOTF
d8c1195d31eb drm/i915: Enable infoframes on GLK+ for HDR
-:57: WARNING:LONG_LINE: line over 100 characters
#57: FILE: drivers/gpu/drm/i915/i915_reg.h:8190:
+#define GLK_TVIDEO_DIP_DRM_DATA(trans, i)	_MMIO_TRANS2(trans, _GLK_VIDEO_DIP_DRM_DATA_A + (i) * 4)

total: 0 errors, 1 warnings, 0 checks, 72 lines checked
f3797bbcf507 drm/i915:Enabled Modeset when HDR Infoframe changes
d74cf996f1e0 drm/i915: Added DRM Infoframe handling for BYT/CHT
dcd93072f636 video/hdmi: Add Unpack function for DRM infoframe
b7ccb67c3091 drm/i915: Add state readout for DRM infoframe

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 40+ messages in thread

* ✓ Fi.CI.BAT: success for Add HDR Metadata Parsing and handling in DRM layer (rev11)
  2019-05-16 14:10 [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
                   ` (12 preceding siblings ...)
  2019-05-16 14:12 ` ✗ Fi.CI.CHECKPATCH: warning for Add HDR Metadata Parsing and handling in DRM layer (rev11) Patchwork
@ 2019-05-16 14:37 ` Patchwork
  2019-05-16 19:35 ` ✓ Fi.CI.IGT: " Patchwork
                   ` (8 subsequent siblings)
  22 siblings, 0 replies; 40+ messages in thread
From: Patchwork @ 2019-05-16 14:37 UTC (permalink / raw)
  To: Uma Shankar; +Cc: intel-gfx

== Series Details ==

Series: Add HDR Metadata Parsing and handling in DRM layer (rev11)
URL   : https://patchwork.freedesktop.org/series/25091/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_6090 -> Patchwork_13025
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13025/

Known issues
------------

  Here are the changes found in Patchwork_13025 that come from known issues:

### IGT changes ###

#### Possible fixes ####

  * igt@i915_selftest@live_contexts:
    - fi-bdw-gvtdvm:      [DMESG-FAIL][1] ([fdo#110235]) -> [PASS][2]
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6090/fi-bdw-gvtdvm/igt@i915_selftest@live_contexts.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13025/fi-bdw-gvtdvm/igt@i915_selftest@live_contexts.html

  * igt@i915_selftest@live_hangcheck:
    - {fi-icl-y}:         [INCOMPLETE][3] ([fdo#107713] / [fdo#108569]) -> [PASS][4]
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6090/fi-icl-y/igt@i915_selftest@live_hangcheck.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13025/fi-icl-y/igt@i915_selftest@live_hangcheck.html

  
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
  [fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
  [fdo#110235]: https://bugs.freedesktop.org/show_bug.cgi?id=110235


Participating hosts (50 -> 44)
------------------------------

  Additional (3): fi-icl-dsi fi-ivb-3770 fi-apl-guc 
  Missing    (9): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-skl-guc fi-byt-squawks fi-bsw-cyan fi-pnv-d510 fi-byt-clapper fi-bdw-samus 


Build changes
-------------

  * Linux: CI_DRM_6090 -> Patchwork_13025

  CI_DRM_6090: df27ebbc9ec0d8ae42e8cf3d7a3b29fd6baf4940 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4992: 0d488fae6d35c222c8a527c9fb85614800ead646 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_13025: b7ccb67c3091f1658e0c3467a535257fd19761c0 @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

b7ccb67c3091 drm/i915: Add state readout for DRM infoframe
dcd93072f636 video/hdmi: Add Unpack function for DRM infoframe
d74cf996f1e0 drm/i915: Added DRM Infoframe handling for BYT/CHT
f3797bbcf507 drm/i915:Enabled Modeset when HDR Infoframe changes
d8c1195d31eb drm/i915: Enable infoframes on GLK+ for HDR
538cf737007c drm: Add HLG EOTF
77b052459da8 drm/i915: Write HDR infoframe and send to panel
495dfdf065ff drm/i915: Attach HDR metadata property to connector
736754715323 drm: Enable HDR infoframe support
b95d51f65c44 drm: Parse HDR metadata info from EDID
4d08742fedee drm: Add reference counting on HDR metadata blob
c372f3162e09 drm: Add HDR source metadata property

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13025/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 40+ messages in thread

* ✓ Fi.CI.IGT: success for Add HDR Metadata Parsing and handling in DRM layer (rev11)
  2019-05-16 14:10 [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
                   ` (13 preceding siblings ...)
  2019-05-16 14:37 ` ✓ Fi.CI.BAT: success " Patchwork
@ 2019-05-16 19:35 ` Patchwork
  2019-05-17 16:07 ` ✗ Fi.CI.CHECKPATCH: warning for Add HDR Metadata Parsing and handling in DRM layer (rev14) Patchwork
                   ` (7 subsequent siblings)
  22 siblings, 0 replies; 40+ messages in thread
From: Patchwork @ 2019-05-16 19:35 UTC (permalink / raw)
  To: Uma Shankar; +Cc: intel-gfx

== Series Details ==

Series: Add HDR Metadata Parsing and handling in DRM layer (rev11)
URL   : https://patchwork.freedesktop.org/series/25091/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_6090_full -> Patchwork_13025_full
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  

Known issues
------------

  Here are the changes found in Patchwork_13025_full that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@gem_ctx_isolation@rcs0-s3:
    - shard-apl:          [PASS][1] -> [DMESG-WARN][2] ([fdo#108566]) +1 similar issue
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6090/shard-apl7/igt@gem_ctx_isolation@rcs0-s3.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13025/shard-apl1/igt@gem_ctx_isolation@rcs0-s3.html

  * igt@i915_pm_rpm@legacy-planes-dpms:
    - shard-skl:          [PASS][3] -> [INCOMPLETE][4] ([fdo#107807])
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6090/shard-skl6/igt@i915_pm_rpm@legacy-planes-dpms.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13025/shard-skl1/igt@i915_pm_rpm@legacy-planes-dpms.html

  * igt@i915_pm_rpm@system-suspend:
    - shard-iclb:         [PASS][5] -> [INCOMPLETE][6] ([fdo#107713] / [fdo#108840])
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6090/shard-iclb2/igt@i915_pm_rpm@system-suspend.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13025/shard-iclb7/igt@i915_pm_rpm@system-suspend.html

  * igt@i915_pm_rpm@system-suspend-execbuf:
    - shard-skl:          [PASS][7] -> [INCOMPLETE][8] ([fdo#104108] / [fdo#107807])
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6090/shard-skl8/igt@i915_pm_rpm@system-suspend-execbuf.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13025/shard-skl10/igt@i915_pm_rpm@system-suspend-execbuf.html

  * igt@i915_suspend@sysfs-reader:
    - shard-skl:          [PASS][9] -> [INCOMPLETE][10] ([fdo#104108])
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6090/shard-skl9/igt@i915_suspend@sysfs-reader.html
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13025/shard-skl4/igt@i915_suspend@sysfs-reader.html

  * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-msflip-blt:
    - shard-iclb:         [PASS][11] -> [FAIL][12] ([fdo#103167]) +5 similar issues
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6090/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-msflip-blt.html
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13025/shard-iclb5/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-msflip-blt.html

  * igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
    - shard-skl:          [PASS][13] -> [FAIL][14] ([fdo#108145] / [fdo#110403])
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6090/shard-skl4/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13025/shard-skl9/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html

  * igt@kms_psr@psr2_cursor_plane_onoff:
    - shard-iclb:         [PASS][15] -> [SKIP][16] ([fdo#109441]) +3 similar issues
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6090/shard-iclb2/igt@kms_psr@psr2_cursor_plane_onoff.html
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13025/shard-iclb7/igt@kms_psr@psr2_cursor_plane_onoff.html

  
#### Possible fixes ####

  * igt@gem_eio@in-flight-suspend:
    - shard-kbl:          [FAIL][17] ([fdo#110667]) -> [PASS][18]
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6090/shard-kbl3/igt@gem_eio@in-flight-suspend.html
   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13025/shard-kbl1/igt@gem_eio@in-flight-suspend.html

  * igt@gem_eio@unwedge-stress:
    - shard-glk:          [FAIL][19] ([fdo#109661]) -> [PASS][20]
   [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6090/shard-glk1/igt@gem_eio@unwedge-stress.html
   [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13025/shard-glk6/igt@gem_eio@unwedge-stress.html

  * igt@gem_exec_suspend@basic-s3:
    - shard-snb:          [DMESG-WARN][21] ([fdo#102365]) -> [PASS][22]
   [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6090/shard-snb7/igt@gem_exec_suspend@basic-s3.html
   [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13025/shard-snb7/igt@gem_exec_suspend@basic-s3.html

  * igt@i915_pm_rpm@fences:
    - shard-skl:          [INCOMPLETE][23] ([fdo#107807]) -> [PASS][24] +1 similar issue
   [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6090/shard-skl2/igt@i915_pm_rpm@fences.html
   [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13025/shard-skl2/igt@i915_pm_rpm@fences.html

  * igt@i915_suspend@fence-restore-tiled2untiled:
    - shard-apl:          [DMESG-WARN][25] ([fdo#108566]) -> [PASS][26] +5 similar issues
   [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6090/shard-apl6/igt@i915_suspend@fence-restore-tiled2untiled.html
   [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13025/shard-apl6/igt@i915_suspend@fence-restore-tiled2untiled.html

  * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-move:
    - shard-iclb:         [FAIL][27] ([fdo#103167]) -> [PASS][28] +11 similar issues
   [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6090/shard-iclb5/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-move.html
   [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13025/shard-iclb2/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-move.html

  * igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
    - shard-skl:          [FAIL][29] ([fdo#108145]) -> [PASS][30]
   [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6090/shard-skl4/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
   [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13025/shard-skl7/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html

  * igt@kms_setmode@basic:
    - shard-kbl:          [FAIL][31] ([fdo#99912]) -> [PASS][32]
   [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6090/shard-kbl7/igt@kms_setmode@basic.html
   [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13025/shard-kbl3/igt@kms_setmode@basic.html

  
#### Warnings ####

  * igt@i915_pm_rpm@gem-execbuf-stress-pc8:
    - shard-skl:          [SKIP][33] ([fdo#109271]) -> [INCOMPLETE][34] ([fdo#107807]) +1 similar issue
   [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6090/shard-skl9/igt@i915_pm_rpm@gem-execbuf-stress-pc8.html
   [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13025/shard-skl4/igt@i915_pm_rpm@gem-execbuf-stress-pc8.html

  * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-fullscreen:
    - shard-skl:          [FAIL][35] ([fdo#103167]) -> [FAIL][36] ([fdo#108040])
   [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6090/shard-skl10/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-fullscreen.html
   [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13025/shard-skl3/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-fullscreen.html

  
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  [fdo#102365]: https://bugs.freedesktop.org/show_bug.cgi?id=102365
  [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
  [fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
  [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
  [fdo#107807]: https://bugs.freedesktop.org/show_bug.cgi?id=107807
  [fdo#108040]: https://bugs.freedesktop.org/show_bug.cgi?id=108040
  [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
  [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
  [fdo#108840]: https://bugs.freedesktop.org/show_bug.cgi?id=108840
  [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
  [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
  [fdo#109661]: https://bugs.freedesktop.org/show_bug.cgi?id=109661
  [fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
  [fdo#110667]: https://bugs.freedesktop.org/show_bug.cgi?id=110667
  [fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912


Participating hosts (11 -> 10)
------------------------------

  Missing    (1): pig-snb-2600 


Build changes
-------------

  * Linux: CI_DRM_6090 -> Patchwork_13025

  CI_DRM_6090: df27ebbc9ec0d8ae42e8cf3d7a3b29fd6baf4940 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4992: 0d488fae6d35c222c8a527c9fb85614800ead646 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_13025: b7ccb67c3091f1658e0c3467a535257fd19761c0 @ git://anongit.freedesktop.org/gfx-ci/linux
  piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13025/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [v11 08/12] drm/i915: Enable infoframes on GLK+ for HDR
  2019-05-16 14:10 ` [v11 08/12] drm/i915: Enable infoframes on GLK+ for HDR Uma Shankar
@ 2019-05-17 14:01   ` Ville Syrjälä
  2019-05-17 16:22     ` [v12 " Uma Shankar
  0 siblings, 1 reply; 40+ messages in thread
From: Ville Syrjälä @ 2019-05-17 14:01 UTC (permalink / raw)
  To: Uma Shankar
  Cc: dcastagna, jonas, intel-gfx, emil.l.velikov, dri-devel, seanpaul

On Thu, May 16, 2019 at 07:40:13PM +0530, Uma Shankar wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> This patch enables infoframes on GLK+ to be
> used to send HDR metadata to HDMI sink.
> 
> v2: Addressed Shashank's review comment.
> 
> v3: Addressed Shashank's review comment.
> 
> v4: Added Shashank's RB.
> 
> v5: Dropped hdr_metadata_change check while modeset, as per
> Ville's suggestion.
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Signed-off-by: Uma Shankar <uma.shankar@intel.com>
> Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_reg.h   |  4 ++++
>  drivers/gpu/drm/i915/intel_hdmi.c | 19 +++++++++++++++----
>  2 files changed, 19 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index e97c47f..d3f5510 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -4694,6 +4694,7 @@ enum {
>  #define   VIDEO_DIP_FREQ_MASK		(3 << 16)
>  /* HSW and later: */
>  #define   DRM_DIP_ENABLE		(1 << 28)

Just noticed this duplicate bit definition. The new name looks to
be more in line with the names of the other bits, so I would just
kill this old bogus defintion while at it.

> +#define   VIDEO_DIP_ENABLE_DRM_GLK	(1 << 28)
>  #define   PSR_VSC_BIT_7_SET		(1 << 27)
>  #define   VSC_SELECT_MASK		(0x3 << 25)
>  #define   VSC_SELECT_SHIFT		25
> @@ -8146,6 +8147,7 @@ enum {
>  #define _HSW_VIDEO_DIP_SPD_DATA_A	0x602A0
>  #define _HSW_VIDEO_DIP_GMP_DATA_A	0x602E0
>  #define _HSW_VIDEO_DIP_VSC_DATA_A	0x60320
> +#define _GLK_VIDEO_DIP_DRM_DATA_A	0x60440
>  #define _HSW_VIDEO_DIP_AVI_ECC_A	0x60240
>  #define _HSW_VIDEO_DIP_VS_ECC_A		0x60280
>  #define _HSW_VIDEO_DIP_SPD_ECC_A	0x602C0
> @@ -8159,6 +8161,7 @@ enum {
>  #define _HSW_VIDEO_DIP_SPD_DATA_B	0x612A0
>  #define _HSW_VIDEO_DIP_GMP_DATA_B	0x612E0
>  #define _HSW_VIDEO_DIP_VSC_DATA_B	0x61320
> +#define _GLK_VIDEO_DIP_DRM_DATA_B	0x61440
>  #define _HSW_VIDEO_DIP_BVI_ECC_B	0x61240
>  #define _HSW_VIDEO_DIP_VS_ECC_B		0x61280
>  #define _HSW_VIDEO_DIP_SPD_ECC_B	0x612C0
> @@ -8184,6 +8187,7 @@ enum {
>  #define HSW_TVIDEO_DIP_SPD_DATA(trans, i)	_MMIO_TRANS2(trans, _HSW_VIDEO_DIP_SPD_DATA_A + (i) * 4)
>  #define HSW_TVIDEO_DIP_GMP_DATA(trans, i)	_MMIO_TRANS2(trans, _HSW_VIDEO_DIP_GMP_DATA_A + (i) * 4)
>  #define HSW_TVIDEO_DIP_VSC_DATA(trans, i)	_MMIO_TRANS2(trans, _HSW_VIDEO_DIP_VSC_DATA_A + (i) * 4)
> +#define GLK_TVIDEO_DIP_DRM_DATA(trans, i)	_MMIO_TRANS2(trans, _GLK_VIDEO_DIP_DRM_DATA_A + (i) * 4)
>  #define ICL_VIDEO_DIP_PPS_DATA(trans, i)	_MMIO_TRANS2(trans, _ICL_VIDEO_DIP_PPS_DATA_A + (i) * 4)
>  #define ICL_VIDEO_DIP_PPS_ECC(trans, i)		_MMIO_TRANS2(trans, _ICL_VIDEO_DIP_PPS_ECC_A + (i) * 4)
>  
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index d3b8e09..8bd7c07 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -152,6 +152,8 @@ static u32 hsw_infoframe_enable(unsigned int type)
>  		return VIDEO_DIP_ENABLE_SPD_HSW;
>  	case HDMI_INFOFRAME_TYPE_VENDOR:
>  		return VIDEO_DIP_ENABLE_VS_HSW;
> +	case HDMI_INFOFRAME_TYPE_DRM:
> +		return VIDEO_DIP_ENABLE_DRM_GLK;
>  	default:
>  		MISSING_CASE(type);
>  		return 0;
> @@ -177,6 +179,8 @@ static u32 hsw_infoframe_enable(unsigned int type)
>  		return HSW_TVIDEO_DIP_SPD_DATA(cpu_transcoder, i);
>  	case HDMI_INFOFRAME_TYPE_VENDOR:
>  		return HSW_TVIDEO_DIP_VS_DATA(cpu_transcoder, i);
> +	case HDMI_INFOFRAME_TYPE_DRM:
> +		return GLK_TVIDEO_DIP_DRM_DATA(cpu_transcoder, i);
>  	default:
>  		MISSING_CASE(type);
>  		return INVALID_MMIO_REG;
> @@ -560,10 +564,16 @@ static u32 hsw_infoframes_enabled(struct intel_encoder *encoder,
>  {
>  	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
>  	u32 val = I915_READ(HSW_TVIDEO_DIP_CTL(pipe_config->cpu_transcoder));
> +	u32 mask;
>  
> -	return val & (VIDEO_DIP_ENABLE_VSC_HSW | VIDEO_DIP_ENABLE_AVI_HSW |
> -		      VIDEO_DIP_ENABLE_GCP_HSW | VIDEO_DIP_ENABLE_VS_HSW |
> -		      VIDEO_DIP_ENABLE_GMP_HSW | VIDEO_DIP_ENABLE_SPD_HSW);
> +	mask = (VIDEO_DIP_ENABLE_VSC_HSW | VIDEO_DIP_ENABLE_AVI_HSW |
> +		VIDEO_DIP_ENABLE_GCP_HSW | VIDEO_DIP_ENABLE_VS_HSW |
> +		VIDEO_DIP_ENABLE_GMP_HSW | VIDEO_DIP_ENABLE_SPD_HSW);
> +
> +	if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
> +		mask |= VIDEO_DIP_ENABLE_DRM_GLK;
> +
> +	return val & mask;
>  }
>  
>  static const u8 infoframe_type_to_idx[] = {
> @@ -1193,7 +1203,8 @@ static void hsw_set_infoframes(struct intel_encoder *encoder,
>  
>  	val &= ~(VIDEO_DIP_ENABLE_VSC_HSW | VIDEO_DIP_ENABLE_AVI_HSW |
>  		 VIDEO_DIP_ENABLE_GCP_HSW | VIDEO_DIP_ENABLE_VS_HSW |
> -		 VIDEO_DIP_ENABLE_GMP_HSW | VIDEO_DIP_ENABLE_SPD_HSW);
> +		 VIDEO_DIP_ENABLE_GMP_HSW | VIDEO_DIP_ENABLE_SPD_HSW |
> +		 VIDEO_DIP_ENABLE_DRM_GLK);
>  
>  	if (!enable) {
>  		I915_WRITE(reg, val);
> -- 
> 1.9.1

-- 
Ville Syrjälä
Intel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [v11 06/12] drm/i915: Write HDR infoframe and send to panel
  2019-05-16 14:10 ` [v11 06/12] drm/i915: Write HDR infoframe and send to panel Uma Shankar
@ 2019-05-17 14:06   ` Ville Syrjälä
  2019-05-17 16:20     ` [v12 " Uma Shankar
  0 siblings, 1 reply; 40+ messages in thread
From: Ville Syrjälä @ 2019-05-17 14:06 UTC (permalink / raw)
  To: Uma Shankar
  Cc: dcastagna, jonas, intel-gfx, emil.l.velikov, dri-devel, seanpaul

On Thu, May 16, 2019 at 07:40:11PM +0530, 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.
> 
> v6: Addressed Shashank's review comment. Added HDR metadata
> support from GEN10 onwards as per Shashank's recommendation.
> 
> v7: Addressed Shashank's review comments
> 
> v8: Added Shashank's RB.
> 
> v9: Addressed Ville's review comments.
> 
> Signed-off-by: Uma Shankar <uma.shankar@intel.com>
> Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_drv.h  |  1 +
>  drivers/gpu/drm/i915/intel_hdmi.c | 44 +++++++++++++++++++++++++++++++++++++++
>  2 files changed, 45 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 5258abb..40e2c52 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -910,6 +910,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 92597d8..d3b8e09 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -573,6 +573,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)
> @@ -795,6 +796,41 @@ 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 drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> +	int ret;
> +
> +	if (!(INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)))
> +		return true;
> +
> +	if (!crtc_state->has_infoframe)
> +		return true;
> +
> +	if (!conn_state->hdr_output_metadata ||
> +	    conn_state->hdr_output_metadata->length == 0)

The core has already done the length check for us. So can be dropped
from here.

> +		return true;
> +
> +	crtc_state->infoframes.enable |=
> +		intel_hdmi_infoframe_enable(HDMI_INFOFRAME_TYPE_DRM);
> +
> +	ret = drm_hdmi_infoframe_set_hdr_metadata(frame, conn_state);
> +	if (ret < 0) {
> +		DRM_ERROR("couldn't set HDR metadata in infoframe\n");

Still a user triggreable ERROR.

> +		return false;
> +	}
> +
> +	ret = hdmi_drm_infoframe_check(frame);
> +	if (WARN_ON(ret))
> +		return false;
> +
> +	return true;
> +}
> +
>  static void g4x_set_infoframes(struct intel_encoder *encoder,
>  			       bool enable,
>  			       const struct intel_crtc_state *crtc_state,
> @@ -1180,6 +1216,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)
> @@ -2386,6 +2425,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;
>  }
>  
> -- 
> 1.9.1

-- 
Ville Syrjälä
Intel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [v11 05/12] drm/i915: Attach HDR metadata property to connector
  2019-05-16 14:10 ` [v11 05/12] drm/i915: Attach HDR metadata property to connector Uma Shankar
@ 2019-05-17 14:06   ` Ville Syrjälä
  2019-05-17 16:19     ` [v12 " Uma Shankar
  0 siblings, 1 reply; 40+ messages in thread
From: Ville Syrjälä @ 2019-05-17 14:06 UTC (permalink / raw)
  To: Uma Shankar
  Cc: dcastagna, jonas, intel-gfx, emil.l.velikov, dri-devel, seanpaul

On Thu, May 16, 2019 at 07:40:10PM +0530, Uma Shankar wrote:
> Attach HDR metadata property to connector object.
> 
> v2: Rebase
> 
> v3: Updated the property name as per updated name
> while creating hdr metadata property
> 
> Signed-off-by: Uma Shankar <uma.shankar@intel.com>
> Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_hdmi.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index 2a4086c..92597d8 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -2724,6 +2724,8 @@ static void intel_hdmi_destroy(struct drm_connector *connector)
>  
>  	drm_connector_attach_content_type_property(connector);
>  	connector->state->picture_aspect_ratio = HDMI_PICTURE_ASPECT_NONE;
> +	drm_object_attach_property(&connector->base,
> +				   connector->dev->mode_config.hdr_output_metadata_property, 0);

I think this needs a platform check. We shouldn't expose this on
platforms that can't actually transmit the infoframe.

>  
>  	if (!HAS_GMCH(dev_priv))
>  		drm_connector_attach_max_bpc_property(connector, 8, 12);
> -- 
> 1.9.1

-- 
Ville Syrjälä
Intel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 40+ messages in thread

* ✗ Fi.CI.CHECKPATCH: warning for Add HDR Metadata Parsing and handling in DRM layer (rev14)
  2019-05-16 14:10 [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
                   ` (14 preceding siblings ...)
  2019-05-16 19:35 ` ✓ Fi.CI.IGT: " Patchwork
@ 2019-05-17 16:07 ` Patchwork
  2019-05-17 16:34 ` ✓ Fi.CI.BAT: success " Patchwork
                   ` (6 subsequent siblings)
  22 siblings, 0 replies; 40+ messages in thread
From: Patchwork @ 2019-05-17 16:07 UTC (permalink / raw)
  To: Uma Shankar; +Cc: intel-gfx

== Series Details ==

Series: Add HDR Metadata Parsing and handling in DRM layer (rev14)
URL   : https://patchwork.freedesktop.org/series/25091/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
7c0463e5827f drm: Add HDR source metadata property
-:62: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#62: FILE: drivers/gpu/drm/drm_atomic_uapi.c:733:
+		ret = drm_atomic_replace_property_blob_from_id(dev,
+				&state->hdr_output_metadata,

total: 0 errors, 0 warnings, 1 checks, 144 lines checked
3d1f3cb173f6 drm: Add reference counting on HDR metadata blob
4f07c7e5dafd drm: Parse HDR metadata info from EDID
17ab87bad491 drm: Enable HDR infoframe support
-:92: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#92: FILE: drivers/gpu/drm/drm_edid.c:4943:
+	if (!is_eotf_supported(hdr_metadata->hdmi_metadata_type1.eotf,
+	    connector->hdr_sink_metadata.hdmi_type1.eotf)) {

total: 0 errors, 0 warnings, 1 checks, 379 lines checked
6b40c837a210 drm/i915: Attach HDR metadata property to connector
-:28: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#28: FILE: drivers/gpu/drm/i915/intel_hdmi.c:2730:
+		drm_object_attach_property(&connector->base,
+			connector->dev->mode_config.hdr_output_metadata_property, 0);

total: 0 errors, 0 warnings, 1 checks, 10 lines checked
e3c3a66b51a0 drm/i915: Write HDR infoframe and send to panel
c3c006fd9d35 drm: Add HLG EOTF
3d47411a380b drm/i915: Enable infoframes on GLK+ for HDR
-:21: WARNING:TYPO_SPELLING: 'defintion' may be misspelled - perhaps 'definition'?
#21: 
v6: Removed an unused and duplicate bit defintion, as per Ville's

-:61: WARNING:LONG_LINE: line over 100 characters
#61: FILE: drivers/gpu/drm/i915/i915_reg.h:8189:
+#define GLK_TVIDEO_DIP_DRM_DATA(trans, i)	_MMIO_TRANS2(trans, _GLK_VIDEO_DIP_DRM_DATA_A + (i) * 4)

total: 0 errors, 2 warnings, 0 checks, 73 lines checked
7a1e2c56755d drm/i915:Enabled Modeset when HDR Infoframe changes
8a45fa5a794f drm/i915: Added DRM Infoframe handling for BYT/CHT
a6c2488be372 video/hdmi: Add Unpack function for DRM infoframe
0552da2fcaa6 drm/i915: Add state readout for DRM infoframe

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 40+ messages in thread

* [v12 05/12] drm/i915: Attach HDR metadata property to connector
  2019-05-17 14:06   ` Ville Syrjälä
@ 2019-05-17 16:19     ` Uma Shankar
  0 siblings, 0 replies; 40+ messages in thread
From: Uma Shankar @ 2019-05-17 16:19 UTC (permalink / raw)
  To: intel-gfx

Attach HDR metadata property to connector object.

v2: Rebase

v3: Updated the property name as per updated name
while creating hdr metadata property

v4: Added platform check as suggested by Ville.

Signed-off-by: Uma Shankar <uma.shankar@intel.com>
Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
---
 drivers/gpu/drm/i915/intel_hdmi.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 2a4086c..81d72f6 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -2725,6 +2725,10 @@ static void intel_hdmi_destroy(struct drm_connector *connector)
 	drm_connector_attach_content_type_property(connector);
 	connector->state->picture_aspect_ratio = HDMI_PICTURE_ASPECT_NONE;
 
+	if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
+		drm_object_attach_property(&connector->base,
+			connector->dev->mode_config.hdr_output_metadata_property, 0);
+
 	if (!HAS_GMCH(dev_priv))
 		drm_connector_attach_max_bpc_property(connector, 8, 12);
 }
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [v12 06/12] drm/i915: Write HDR infoframe and send to panel
  2019-05-17 14:06   ` Ville Syrjälä
@ 2019-05-17 16:20     ` Uma Shankar
  2019-05-18 10:39       ` [v13 " Uma Shankar
  0 siblings, 1 reply; 40+ messages in thread
From: Uma Shankar @ 2019-05-17 16:20 UTC (permalink / raw)
  To: intel-gfx

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.

v6: Addressed Shashank's review comment. Added HDR metadata
support from GEN10 onwards as per Shashank's recommendation.

v7: Addressed Shashank's review comments

v8: Added Shashank's RB.

v9: Addressed Ville's review comments.

v10: Removed a redundant check as core already handles it, as per
Ville's comment.

Signed-off-by: Uma Shankar <uma.shankar@intel.com>
Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
---
 drivers/gpu/drm/i915/intel_drv.h  |  1 +
 drivers/gpu/drm/i915/intel_hdmi.c | 40 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 5258abb..40e2c52 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -910,6 +910,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 81d72f6..e7199be 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -573,6 +573,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)
@@ -795,6 +796,37 @@ 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 drm_i915_private *dev_priv = to_i915(encoder->base.dev);
+	int ret;
+
+	if (!(INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)))
+		return true;
+
+	if (!crtc_state->has_infoframe)
+		return true;
+
+	crtc_state->infoframes.enable |=
+		intel_hdmi_infoframe_enable(HDMI_INFOFRAME_TYPE_DRM);
+
+	ret = drm_hdmi_infoframe_set_hdr_metadata(frame, conn_state);
+	if (ret < 0) {
+		DRM_DEBUG_KMS("couldn't set HDR metadata in infoframe\n");
+		return false;
+	}
+
+	ret = hdmi_drm_infoframe_check(frame);
+	if (WARN_ON(ret))
+		return false;
+
+	return true;
+}
+
 static void g4x_set_infoframes(struct intel_encoder *encoder,
 			       bool enable,
 			       const struct intel_crtc_state *crtc_state,
@@ -1180,6 +1212,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)
@@ -2386,6 +2421,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;
 }
 
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 40+ messages in thread

* [v12 08/12] drm/i915: Enable infoframes on GLK+ for HDR
  2019-05-17 14:01   ` Ville Syrjälä
@ 2019-05-17 16:22     ` Uma Shankar
  0 siblings, 0 replies; 40+ messages in thread
From: Uma Shankar @ 2019-05-17 16:22 UTC (permalink / raw)
  To: intel-gfx

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

This patch enables infoframes on GLK+ to be
used to send HDR metadata to HDMI sink.

v2: Addressed Shashank's review comment.

v3: Addressed Shashank's review comment.

v4: Added Shashank's RB.

v5: Dropped hdr_metadata_change check while modeset, as per
Ville's suggestion.

v6: Removed an unused and duplicate bit defintion, as per Ville's
comment.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
---
 drivers/gpu/drm/i915/i915_reg.h   |  5 ++++-
 drivers/gpu/drm/i915/intel_hdmi.c | 19 +++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index e97c47f..1a5a405 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -4693,7 +4693,7 @@ enum {
 #define   VIDEO_DIP_FREQ_2VSYNC		(2 << 16)
 #define   VIDEO_DIP_FREQ_MASK		(3 << 16)
 /* HSW and later: */
-#define   DRM_DIP_ENABLE		(1 << 28)
+#define   VIDEO_DIP_ENABLE_DRM_GLK	(1 << 28)
 #define   PSR_VSC_BIT_7_SET		(1 << 27)
 #define   VSC_SELECT_MASK		(0x3 << 25)
 #define   VSC_SELECT_SHIFT		25
@@ -8146,6 +8146,7 @@ enum {
 #define _HSW_VIDEO_DIP_SPD_DATA_A	0x602A0
 #define _HSW_VIDEO_DIP_GMP_DATA_A	0x602E0
 #define _HSW_VIDEO_DIP_VSC_DATA_A	0x60320
+#define _GLK_VIDEO_DIP_DRM_DATA_A	0x60440
 #define _HSW_VIDEO_DIP_AVI_ECC_A	0x60240
 #define _HSW_VIDEO_DIP_VS_ECC_A		0x60280
 #define _HSW_VIDEO_DIP_SPD_ECC_A	0x602C0
@@ -8159,6 +8160,7 @@ enum {
 #define _HSW_VIDEO_DIP_SPD_DATA_B	0x612A0
 #define _HSW_VIDEO_DIP_GMP_DATA_B	0x612E0
 #define _HSW_VIDEO_DIP_VSC_DATA_B	0x61320
+#define _GLK_VIDEO_DIP_DRM_DATA_B	0x61440
 #define _HSW_VIDEO_DIP_BVI_ECC_B	0x61240
 #define _HSW_VIDEO_DIP_VS_ECC_B		0x61280
 #define _HSW_VIDEO_DIP_SPD_ECC_B	0x612C0
@@ -8184,6 +8186,7 @@ enum {
 #define HSW_TVIDEO_DIP_SPD_DATA(trans, i)	_MMIO_TRANS2(trans, _HSW_VIDEO_DIP_SPD_DATA_A + (i) * 4)
 #define HSW_TVIDEO_DIP_GMP_DATA(trans, i)	_MMIO_TRANS2(trans, _HSW_VIDEO_DIP_GMP_DATA_A + (i) * 4)
 #define HSW_TVIDEO_DIP_VSC_DATA(trans, i)	_MMIO_TRANS2(trans, _HSW_VIDEO_DIP_VSC_DATA_A + (i) * 4)
+#define GLK_TVIDEO_DIP_DRM_DATA(trans, i)	_MMIO_TRANS2(trans, _GLK_VIDEO_DIP_DRM_DATA_A + (i) * 4)
 #define ICL_VIDEO_DIP_PPS_DATA(trans, i)	_MMIO_TRANS2(trans, _ICL_VIDEO_DIP_PPS_DATA_A + (i) * 4)
 #define ICL_VIDEO_DIP_PPS_ECC(trans, i)		_MMIO_TRANS2(trans, _ICL_VIDEO_DIP_PPS_ECC_A + (i) * 4)
 
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index e7199be..630d505 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -152,6 +152,8 @@ static u32 hsw_infoframe_enable(unsigned int type)
 		return VIDEO_DIP_ENABLE_SPD_HSW;
 	case HDMI_INFOFRAME_TYPE_VENDOR:
 		return VIDEO_DIP_ENABLE_VS_HSW;
+	case HDMI_INFOFRAME_TYPE_DRM:
+		return VIDEO_DIP_ENABLE_DRM_GLK;
 	default:
 		MISSING_CASE(type);
 		return 0;
@@ -177,6 +179,8 @@ static u32 hsw_infoframe_enable(unsigned int type)
 		return HSW_TVIDEO_DIP_SPD_DATA(cpu_transcoder, i);
 	case HDMI_INFOFRAME_TYPE_VENDOR:
 		return HSW_TVIDEO_DIP_VS_DATA(cpu_transcoder, i);
+	case HDMI_INFOFRAME_TYPE_DRM:
+		return GLK_TVIDEO_DIP_DRM_DATA(cpu_transcoder, i);
 	default:
 		MISSING_CASE(type);
 		return INVALID_MMIO_REG;
@@ -560,10 +564,16 @@ static u32 hsw_infoframes_enabled(struct intel_encoder *encoder,
 {
 	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
 	u32 val = I915_READ(HSW_TVIDEO_DIP_CTL(pipe_config->cpu_transcoder));
+	u32 mask;
 
-	return val & (VIDEO_DIP_ENABLE_VSC_HSW | VIDEO_DIP_ENABLE_AVI_HSW |
-		      VIDEO_DIP_ENABLE_GCP_HSW | VIDEO_DIP_ENABLE_VS_HSW |
-		      VIDEO_DIP_ENABLE_GMP_HSW | VIDEO_DIP_ENABLE_SPD_HSW);
+	mask = (VIDEO_DIP_ENABLE_VSC_HSW | VIDEO_DIP_ENABLE_AVI_HSW |
+		VIDEO_DIP_ENABLE_GCP_HSW | VIDEO_DIP_ENABLE_VS_HSW |
+		VIDEO_DIP_ENABLE_GMP_HSW | VIDEO_DIP_ENABLE_SPD_HSW);
+
+	if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
+		mask |= VIDEO_DIP_ENABLE_DRM_GLK;
+
+	return val & mask;
 }
 
 static const u8 infoframe_type_to_idx[] = {
@@ -1189,7 +1199,8 @@ static void hsw_set_infoframes(struct intel_encoder *encoder,
 
 	val &= ~(VIDEO_DIP_ENABLE_VSC_HSW | VIDEO_DIP_ENABLE_AVI_HSW |
 		 VIDEO_DIP_ENABLE_GCP_HSW | VIDEO_DIP_ENABLE_VS_HSW |
-		 VIDEO_DIP_ENABLE_GMP_HSW | VIDEO_DIP_ENABLE_SPD_HSW);
+		 VIDEO_DIP_ENABLE_GMP_HSW | VIDEO_DIP_ENABLE_SPD_HSW |
+		 VIDEO_DIP_ENABLE_DRM_GLK);
 
 	if (!enable) {
 		I915_WRITE(reg, val);
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 40+ messages in thread

* ✓ Fi.CI.BAT: success for Add HDR Metadata Parsing and handling in DRM layer (rev14)
  2019-05-16 14:10 [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
                   ` (15 preceding siblings ...)
  2019-05-17 16:07 ` ✗ Fi.CI.CHECKPATCH: warning for Add HDR Metadata Parsing and handling in DRM layer (rev14) Patchwork
@ 2019-05-17 16:34 ` Patchwork
  2019-05-18  3:18 ` ✗ Fi.CI.IGT: failure " Patchwork
                   ` (5 subsequent siblings)
  22 siblings, 0 replies; 40+ messages in thread
From: Patchwork @ 2019-05-17 16:34 UTC (permalink / raw)
  To: Uma Shankar; +Cc: intel-gfx

== Series Details ==

Series: Add HDR Metadata Parsing and handling in DRM layer (rev14)
URL   : https://patchwork.freedesktop.org/series/25091/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_6096 -> Patchwork_13032
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/

Known issues
------------

  Here are the changes found in Patchwork_13032 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@i915_pm_rpm@module-reload:
    - fi-skl-6770hq:      [PASS][1] -> [FAIL][2] ([fdo#108511])
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/fi-skl-6770hq/igt@i915_pm_rpm@module-reload.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/fi-skl-6770hq/igt@i915_pm_rpm@module-reload.html

  * igt@i915_selftest@live_hangcheck:
    - fi-skl-iommu:       [PASS][3] -> [INCOMPLETE][4] ([fdo#108602] / [fdo#108744])
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/fi-skl-iommu/igt@i915_selftest@live_hangcheck.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/fi-skl-iommu/igt@i915_selftest@live_hangcheck.html

  
#### Possible fixes ####

  * igt@gem_basic@bad-close:
    - fi-icl-u2:          [INCOMPLETE][5] ([fdo#107713]) -> [PASS][6]
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/fi-icl-u2/igt@gem_basic@bad-close.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/fi-icl-u2/igt@gem_basic@bad-close.html

  * igt@gem_cpu_reloc@basic:
    - {fi-icl-y}:         [INCOMPLETE][7] ([fdo#107713] / [fdo#110246]) -> [PASS][8]
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/fi-icl-y/igt@gem_cpu_reloc@basic.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/fi-icl-y/igt@gem_cpu_reloc@basic.html
    - {fi-icl-u3}:        [INCOMPLETE][9] ([fdo#107713] / [fdo#110246]) -> [PASS][10]
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/fi-icl-u3/igt@gem_cpu_reloc@basic.html
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/fi-icl-u3/igt@gem_cpu_reloc@basic.html

  
#### Warnings ####

  * igt@i915_selftest@live_hangcheck:
    - fi-apl-guc:         [INCOMPLETE][11] ([fdo#103927] / [fdo#110624]) -> [DMESG-FAIL][12] ([fdo#110620])
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/fi-apl-guc/igt@i915_selftest@live_hangcheck.html
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/fi-apl-guc/igt@i915_selftest@live_hangcheck.html

  * igt@runner@aborted:
    - fi-apl-guc:         [FAIL][13] ([fdo#110624]) -> [FAIL][14] ([fdo#110622])
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/fi-apl-guc/igt@runner@aborted.html
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/fi-apl-guc/igt@runner@aborted.html

  
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
  [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
  [fdo#108511]: https://bugs.freedesktop.org/show_bug.cgi?id=108511
  [fdo#108602]: https://bugs.freedesktop.org/show_bug.cgi?id=108602
  [fdo#108744]: https://bugs.freedesktop.org/show_bug.cgi?id=108744
  [fdo#110246]: https://bugs.freedesktop.org/show_bug.cgi?id=110246
  [fdo#110620]: https://bugs.freedesktop.org/show_bug.cgi?id=110620
  [fdo#110622]: https://bugs.freedesktop.org/show_bug.cgi?id=110622
  [fdo#110624]: https://bugs.freedesktop.org/show_bug.cgi?id=110624


Participating hosts (51 -> 46)
------------------------------

  Additional (2): fi-skl-lmem fi-cml-u 
  Missing    (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus 


Build changes
-------------

  * Linux: CI_DRM_6096 -> Patchwork_13032

  CI_DRM_6096: beb32d3348a566a6aafa292c65e2d60a610479c4 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4996: 6fe5d254ec1b9b47d61408e1b49a7339876bf1e7 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_13032: 0552da2fcaa6a3ffe0bc2b97e2598482f7e69245 @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

0552da2fcaa6 drm/i915: Add state readout for DRM infoframe
a6c2488be372 video/hdmi: Add Unpack function for DRM infoframe
8a45fa5a794f drm/i915: Added DRM Infoframe handling for BYT/CHT
7a1e2c56755d drm/i915:Enabled Modeset when HDR Infoframe changes
3d47411a380b drm/i915: Enable infoframes on GLK+ for HDR
c3c006fd9d35 drm: Add HLG EOTF
e3c3a66b51a0 drm/i915: Write HDR infoframe and send to panel
6b40c837a210 drm/i915: Attach HDR metadata property to connector
17ab87bad491 drm: Enable HDR infoframe support
4f07c7e5dafd drm: Parse HDR metadata info from EDID
3d1f3cb173f6 drm: Add reference counting on HDR metadata blob
7c0463e5827f drm: Add HDR source metadata property

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 40+ messages in thread

* ✗ Fi.CI.IGT: failure for Add HDR Metadata Parsing and handling in DRM layer (rev14)
  2019-05-16 14:10 [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
                   ` (16 preceding siblings ...)
  2019-05-17 16:34 ` ✓ Fi.CI.BAT: success " Patchwork
@ 2019-05-18  3:18 ` Patchwork
  2019-05-18 10:27 ` ✗ Fi.CI.CHECKPATCH: warning for Add HDR Metadata Parsing and handling in DRM layer (rev15) Patchwork
                   ` (4 subsequent siblings)
  22 siblings, 0 replies; 40+ messages in thread
From: Patchwork @ 2019-05-18  3:18 UTC (permalink / raw)
  To: Uma Shankar; +Cc: intel-gfx

== Series Details ==

Series: Add HDR Metadata Parsing and handling in DRM layer (rev14)
URL   : https://patchwork.freedesktop.org/series/25091/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_6096_full -> Patchwork_13032_full
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with Patchwork_13032_full absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_13032_full, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  

Possible new issues
-------------------

  Here are the unknown changes that may have been introduced in Patchwork_13032_full:

### IGT changes ###

#### Possible regressions ####

  * igt@gem_pwrite@big-gtt-random:
    - shard-glk:          [PASS][1] -> [TIMEOUT][2] +2 similar issues
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-glk6/igt@gem_pwrite@big-gtt-random.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-glk5/igt@gem_pwrite@big-gtt-random.html

  * igt@i915_suspend@forcewake:
    - shard-glk:          [PASS][3] -> [DMESG-WARN][4]
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-glk9/igt@i915_suspend@forcewake.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-glk1/igt@i915_suspend@forcewake.html

  * igt@kms_draw_crc@draw-method-xrgb2101010-mmap-wc-untiled:
    - shard-glk:          [PASS][5] -> [FAIL][6] +621 similar issues
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-glk2/igt@kms_draw_crc@draw-method-xrgb2101010-mmap-wc-untiled.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-glk2/igt@kms_draw_crc@draw-method-xrgb2101010-mmap-wc-untiled.html

  * igt@kms_hdmi_inject@inject-4k:
    - shard-iclb:         [PASS][7] -> [FAIL][8] +1 similar issue
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-iclb8/igt@kms_hdmi_inject@inject-4k.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-iclb2/igt@kms_hdmi_inject@inject-4k.html

  * igt@testdisplay:
    - shard-glk:          [PASS][9] -> [WARN][10]
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-glk7/igt@testdisplay.html
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-glk8/igt@testdisplay.html

  
#### Warnings ####

  * igt@kms_hdmi_inject@inject-audio:
    - shard-iclb:         [FAIL][11] ([fdo#102370]) -> [FAIL][12]
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-iclb7/igt@kms_hdmi_inject@inject-audio.html
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-iclb5/igt@kms_hdmi_inject@inject-audio.html

  * igt@kms_plane_alpha_blend@pipe-c-alpha-transparant-fb:
    - shard-glk:          [FAIL][13] ([fdo#108145]) -> [FAIL][14] +5 similar issues
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-glk7/igt@kms_plane_alpha_blend@pipe-c-alpha-transparant-fb.html
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-glk4/igt@kms_plane_alpha_blend@pipe-c-alpha-transparant-fb.html

  * igt@kms_setmode@basic:
    - shard-glk:          [FAIL][15] ([fdo#99912]) -> [FAIL][16]
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-glk6/igt@kms_setmode@basic.html
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-glk7/igt@kms_setmode@basic.html

  
#### Suppressed ####

  The following results come from untrusted machines, tests, or statuses.
  They do not affect the overall result.

  * {igt@kms_cursor_crc@pipe-a-cursor-dpms}:
    - shard-glk:          [FAIL][17] ([fdo#103232]) -> [FAIL][18] +49 similar issues
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-glk9/igt@kms_cursor_crc@pipe-a-cursor-dpms.html
   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-glk1/igt@kms_cursor_crc@pipe-a-cursor-dpms.html

  * {igt@kms_cursor_crc@pipe-c-cursor-64x64-rapid-movement}:
    - shard-glk:          [PASS][19] -> [FAIL][20] +31 similar issues
   [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-glk3/igt@kms_cursor_crc@pipe-c-cursor-64x64-rapid-movement.html
   [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-glk4/igt@kms_cursor_crc@pipe-c-cursor-64x64-rapid-movement.html

  
Known issues
------------

  Here are the changes found in Patchwork_13032_full that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@gem_mmap_gtt@forked-big-copy:
    - shard-iclb:         [PASS][21] -> [TIMEOUT][22] ([fdo#109673])
   [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-iclb3/igt@gem_mmap_gtt@forked-big-copy.html
   [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-iclb1/igt@gem_mmap_gtt@forked-big-copy.html

  * igt@gem_tiled_swapping@non-threaded:
    - shard-glk:          [PASS][23] -> [FAIL][24] ([fdo#108686])
   [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-glk6/igt@gem_tiled_swapping@non-threaded.html
   [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-glk4/igt@gem_tiled_swapping@non-threaded.html

  * igt@i915_pm_rpm@debugfs-read:
    - shard-skl:          [PASS][25] -> [INCOMPLETE][26] ([fdo#107807])
   [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-skl3/igt@i915_pm_rpm@debugfs-read.html
   [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-skl7/igt@i915_pm_rpm@debugfs-read.html

  * igt@i915_suspend@debugfs-reader:
    - shard-skl:          [PASS][27] -> [INCOMPLETE][28] ([fdo#104108])
   [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-skl2/igt@i915_suspend@debugfs-reader.html
   [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-skl2/igt@i915_suspend@debugfs-reader.html

  * igt@i915_suspend@sysfs-reader:
    - shard-apl:          [PASS][29] -> [DMESG-WARN][30] ([fdo#108566]) +2 similar issues
   [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-apl4/igt@i915_suspend@sysfs-reader.html
   [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-apl1/igt@i915_suspend@sysfs-reader.html

  * igt@kms_dp_dsc@basic-dsc-enable-edp:
    - shard-iclb:         [PASS][31] -> [SKIP][32] ([fdo#109349])
   [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-iclb2/igt@kms_dp_dsc@basic-dsc-enable-edp.html
   [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-iclb7/igt@kms_dp_dsc@basic-dsc-enable-edp.html

  * igt@kms_flip@flip-vs-suspend-interruptible:
    - shard-kbl:          [PASS][33] -> [INCOMPLETE][34] ([fdo#103665])
   [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-kbl4/igt@kms_flip@flip-vs-suspend-interruptible.html
   [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-kbl4/igt@kms_flip@flip-vs-suspend-interruptible.html

  * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render:
    - shard-iclb:         [PASS][35] -> [FAIL][36] ([fdo#103167]) +2 similar issues
   [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-iclb5/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
   [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-iclb5/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html

  * igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-shrfb-draw-mmap-cpu:
    - shard-skl:          [PASS][37] -> [FAIL][38] ([fdo#103167])
   [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-skl7/igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-shrfb-draw-mmap-cpu.html
   [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-skl9/igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-shrfb-draw-mmap-cpu.html

  * igt@kms_plane@plane-panning-bottom-right-pipe-a-planes:
    - shard-glk:          [PASS][39] -> [SKIP][40] ([fdo#109271]) +47 similar issues
   [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-glk8/igt@kms_plane@plane-panning-bottom-right-pipe-a-planes.html
   [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-glk1/igt@kms_plane@plane-panning-bottom-right-pipe-a-planes.html

  * igt@kms_plane_alpha_blend@pipe-b-alpha-7efc:
    - shard-glk:          [PASS][41] -> [SKIP][42] ([fdo#109271] / [fdo#109278]) +5 similar issues
   [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-glk7/igt@kms_plane_alpha_blend@pipe-b-alpha-7efc.html
   [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-glk9/igt@kms_plane_alpha_blend@pipe-b-alpha-7efc.html

  * igt@kms_plane_scaling@pipe-a-scaler-with-clipping-clamping:
    - shard-glk:          [PASS][43] -> [FAIL][44] ([fdo#110098]) +6 similar issues
   [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-glk4/igt@kms_plane_scaling@pipe-a-scaler-with-clipping-clamping.html
   [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-glk9/igt@kms_plane_scaling@pipe-a-scaler-with-clipping-clamping.html

  * igt@kms_psr@psr2_sprite_mmap_gtt:
    - shard-iclb:         [PASS][45] -> [SKIP][46] ([fdo#109441])
   [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-iclb2/igt@kms_psr@psr2_sprite_mmap_gtt.html
   [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-iclb5/igt@kms_psr@psr2_sprite_mmap_gtt.html

  
#### Possible fixes ####

  * igt@gem_mmap_gtt@forked-medium-copy-odd:
    - shard-iclb:         [INCOMPLETE][47] ([fdo#107713]) -> [PASS][48]
   [47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-iclb6/igt@gem_mmap_gtt@forked-medium-copy-odd.html
   [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-iclb2/igt@gem_mmap_gtt@forked-medium-copy-odd.html

  * igt@i915_pm_rpm@pm-tiling:
    - shard-skl:          [INCOMPLETE][49] ([fdo#107807]) -> [PASS][50]
   [49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-skl8/igt@i915_pm_rpm@pm-tiling.html
   [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-skl3/igt@i915_pm_rpm@pm-tiling.html

  * igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic:
    - shard-hsw:          [FAIL][51] ([fdo#105767]) -> [PASS][52]
   [51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-hsw4/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic.html
   [52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-hsw1/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic.html

  * igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
    - shard-glk:          [FAIL][53] ([fdo#105363]) -> [PASS][54]
   [53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-glk8/igt@kms_flip@2x-flip-vs-expired-vblank-interruptible.html
   [54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-glk9/igt@kms_flip@2x-flip-vs-expired-vblank-interruptible.html

  * igt@kms_flip@2x-flip-vs-suspend:
    - shard-hsw:          [INCOMPLETE][55] ([fdo#103540]) -> [PASS][56]
   [55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-hsw5/igt@kms_flip@2x-flip-vs-suspend.html
   [56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-hsw6/igt@kms_flip@2x-flip-vs-suspend.html

  * igt@kms_flip@flip-vs-expired-vblank:
    - shard-skl:          [FAIL][57] ([fdo#105363]) -> [PASS][58] +1 similar issue
   [57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-skl7/igt@kms_flip@flip-vs-expired-vblank.html
   [58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-skl5/igt@kms_flip@flip-vs-expired-vblank.html

  * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-msflip-blt:
    - shard-iclb:         [FAIL][59] ([fdo#103167]) -> [PASS][60] +4 similar issues
   [59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-iclb4/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-msflip-blt.html
   [60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-iclb4/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-shrfb-msflip-blt.html

  * igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
    - shard-apl:          [DMESG-WARN][61] ([fdo#108566]) -> [PASS][62]
   [61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-apl8/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes.html
   [62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-apl2/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes.html

  * igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
    - shard-skl:          [FAIL][63] ([fdo#108145]) -> [PASS][64]
   [63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-skl10/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html
   [64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-skl1/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html

  * igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
    - shard-skl:          [FAIL][65] ([fdo#108145] / [fdo#110403]) -> [PASS][66] +1 similar issue
   [65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-skl3/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
   [66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-skl3/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html

  * igt@kms_psr@psr2_sprite_plane_move:
    - shard-iclb:         [SKIP][67] ([fdo#109441]) -> [PASS][68] +2 similar issues
   [67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-iclb5/igt@kms_psr@psr2_sprite_plane_move.html
   [68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html

  * igt@kms_setmode@basic:
    - shard-kbl:          [FAIL][69] ([fdo#99912]) -> [PASS][70]
   [69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-kbl1/igt@kms_setmode@basic.html
   [70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-kbl1/igt@kms_setmode@basic.html

  * igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend:
    - shard-snb:          [SKIP][71] ([fdo#109271]) -> [PASS][72] +1 similar issue
   [71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-snb6/igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend.html
   [72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-snb5/igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend.html

  
#### Warnings ####

  * igt@i915_pm_rpm@dpms-non-lpsp:
    - shard-skl:          [INCOMPLETE][73] ([fdo#107807]) -> [SKIP][74] ([fdo#109271])
   [73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-skl7/igt@i915_pm_rpm@dpms-non-lpsp.html
   [74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-skl6/igt@i915_pm_rpm@dpms-non-lpsp.html

  * igt@kms_plane_alpha_blend@pipe-a-alpha-basic:
    - shard-glk:          [FAIL][75] ([fdo#108145]) -> [SKIP][76] ([fdo#109271] / [fdo#109278]) +2 similar issues
   [75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6096/shard-glk4/igt@kms_plane_alpha_blend@pipe-a-alpha-basic.html
   [76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/shard-glk9/igt@kms_plane_alpha_blend@pipe-a-alpha-basic.html

  
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  [fdo#102370]: https://bugs.freedesktop.org/show_bug.cgi?id=102370
  [fdo#102614]: https://bugs.freedesktop.org/show_bug.cgi?id=102614
  [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
  [fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
  [fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
  [fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
  [fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
  [fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
  [fdo#105767]: https://bugs.freedesktop.org/show_bug.cgi?id=105767
  [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
  [fdo#107773]: https://bugs.freedesktop.org/show_bug.cgi?id=107773
  [fdo#107807]: https://bugs.freedesktop.org/show_bug.cgi?id=107807
  [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
  [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
  [fdo#108686]: https://bugs.freedesktop.org/show_bug.cgi?id=108686
  [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
  [fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
  [fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
  [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
  [fdo#109673]: https://bugs.freedesktop.org/show_bug.cgi?id=109673
  [fdo#110098]: https://bugs.freedesktop.org/show_bug.cgi?id=110098
  [fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
  [fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912


Participating hosts (10 -> 10)
------------------------------

  No changes in participating hosts


Build changes
-------------

  * Linux: CI_DRM_6096 -> Patchwork_13032

  CI_DRM_6096: beb32d3348a566a6aafa292c65e2d60a610479c4 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4996: 6fe5d254ec1b9b47d61408e1b49a7339876bf1e7 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_13032: 0552da2fcaa6a3ffe0bc2b97e2598482f7e69245 @ git://anongit.freedesktop.org/gfx-ci/linux
  piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13032/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 40+ messages in thread

* ✗ Fi.CI.CHECKPATCH: warning for Add HDR Metadata Parsing and handling in DRM layer (rev15)
  2019-05-16 14:10 [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
                   ` (17 preceding siblings ...)
  2019-05-18  3:18 ` ✗ Fi.CI.IGT: failure " Patchwork
@ 2019-05-18 10:27 ` Patchwork
  2019-05-18 10:47 ` ✓ Fi.CI.BAT: success " Patchwork
                   ` (3 subsequent siblings)
  22 siblings, 0 replies; 40+ messages in thread
From: Patchwork @ 2019-05-18 10:27 UTC (permalink / raw)
  To: Uma Shankar; +Cc: intel-gfx

== Series Details ==

Series: Add HDR Metadata Parsing and handling in DRM layer (rev15)
URL   : https://patchwork.freedesktop.org/series/25091/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
67e8b6317a04 drm: Add HDR source metadata property
-:62: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#62: FILE: drivers/gpu/drm/drm_atomic_uapi.c:733:
+		ret = drm_atomic_replace_property_blob_from_id(dev,
+				&state->hdr_output_metadata,

total: 0 errors, 0 warnings, 1 checks, 144 lines checked
325c0bee2297 drm: Add reference counting on HDR metadata blob
9f0d3705e280 drm: Parse HDR metadata info from EDID
cb262c56a16c drm: Enable HDR infoframe support
-:92: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#92: FILE: drivers/gpu/drm/drm_edid.c:4943:
+	if (!is_eotf_supported(hdr_metadata->hdmi_metadata_type1.eotf,
+	    connector->hdr_sink_metadata.hdmi_type1.eotf)) {

total: 0 errors, 0 warnings, 1 checks, 379 lines checked
17c2cbe44bc2 drm/i915: Attach HDR metadata property to connector
-:28: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#28: FILE: drivers/gpu/drm/i915/intel_hdmi.c:2730:
+		drm_object_attach_property(&connector->base,
+			connector->dev->mode_config.hdr_output_metadata_property, 0);

total: 0 errors, 0 warnings, 1 checks, 10 lines checked
0a90660c7a77 drm/i915: Write HDR infoframe and send to panel
d70fed014469 drm: Add HLG EOTF
40daeee96509 drm/i915: Enable infoframes on GLK+ for HDR
-:21: WARNING:TYPO_SPELLING: 'defintion' may be misspelled - perhaps 'definition'?
#21: 
v6: Removed an unused and duplicate bit defintion, as per Ville's

-:61: WARNING:LONG_LINE: line over 100 characters
#61: FILE: drivers/gpu/drm/i915/i915_reg.h:8189:
+#define GLK_TVIDEO_DIP_DRM_DATA(trans, i)	_MMIO_TRANS2(trans, _GLK_VIDEO_DIP_DRM_DATA_A + (i) * 4)

total: 0 errors, 2 warnings, 0 checks, 73 lines checked
fb1031c4174f drm/i915:Enabled Modeset when HDR Infoframe changes
d1b22f3edcc9 drm/i915: Added DRM Infoframe handling for BYT/CHT
b2437ed7bf23 video/hdmi: Add Unpack function for DRM infoframe
d90743ac56ec drm/i915: Add state readout for DRM infoframe

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 40+ messages in thread

* [v13 06/12] drm/i915: Write HDR infoframe and send to panel
  2019-05-17 16:20     ` [v12 " Uma Shankar
@ 2019-05-18 10:39       ` Uma Shankar
  0 siblings, 0 replies; 40+ messages in thread
From: Uma Shankar @ 2019-05-18 10:39 UTC (permalink / raw)
  To: intel-gfx

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.

v6: Addressed Shashank's review comment. Added HDR metadata
support from GEN10 onwards as per Shashank's recommendation.

v7: Addressed Shashank's review comments

v8: Added Shashank's RB.

v9: Addressed Ville's review comments.

v10: Removed a redundant check as core already handles it, as per
Ville's comment.

v11: Added the metadata available check to avoid failure in
compute_config.

Signed-off-by: Uma Shankar <uma.shankar@intel.com>
Reviewed-by: Shashank Sharma <shashank.sharma@intel.com>
---
 drivers/gpu/drm/i915/intel_drv.h  |  1 +
 drivers/gpu/drm/i915/intel_hdmi.c | 43 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 5258abb..40e2c52 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -910,6 +910,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 81d72f6..86a54a3 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -573,6 +573,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)
@@ -795,6 +796,40 @@ 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 drm_i915_private *dev_priv = to_i915(encoder->base.dev);
+	int ret;
+
+	if (!(INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)))
+		return true;
+
+	if (!crtc_state->has_infoframe)
+		return true;
+
+	if (!conn_state->hdr_output_metadata)
+		return true;
+
+	crtc_state->infoframes.enable |=
+		intel_hdmi_infoframe_enable(HDMI_INFOFRAME_TYPE_DRM);
+
+	ret = drm_hdmi_infoframe_set_hdr_metadata(frame, conn_state);
+	if (ret < 0) {
+		DRM_DEBUG_KMS("couldn't set HDR metadata in infoframe\n");
+		return false;
+	}
+
+	ret = hdmi_drm_infoframe_check(frame);
+	if (WARN_ON(ret))
+		return false;
+
+	return true;
+}
+
 static void g4x_set_infoframes(struct intel_encoder *encoder,
 			       bool enable,
 			       const struct intel_crtc_state *crtc_state,
@@ -1180,6 +1215,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)
@@ -2386,6 +2424,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;
 }
 
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 40+ messages in thread

* ✓ Fi.CI.BAT: success for Add HDR Metadata Parsing and handling in DRM layer (rev15)
  2019-05-16 14:10 [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
                   ` (18 preceding siblings ...)
  2019-05-18 10:27 ` ✗ Fi.CI.CHECKPATCH: warning for Add HDR Metadata Parsing and handling in DRM layer (rev15) Patchwork
@ 2019-05-18 10:47 ` Patchwork
  2019-05-18 15:47 ` ✓ Fi.CI.IGT: " Patchwork
                   ` (2 subsequent siblings)
  22 siblings, 0 replies; 40+ messages in thread
From: Patchwork @ 2019-05-18 10:47 UTC (permalink / raw)
  To: Uma Shankar; +Cc: intel-gfx

== Series Details ==

Series: Add HDR Metadata Parsing and handling in DRM layer (rev15)
URL   : https://patchwork.freedesktop.org/series/25091/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_6097 -> Patchwork_13038
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/

Known issues
------------

  Here are the changes found in Patchwork_13038 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@i915_module_load@reload:
    - fi-blb-e6850:       [PASS][1] -> [INCOMPLETE][2] ([fdo#107718])
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/fi-blb-e6850/igt@i915_module_load@reload.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/fi-blb-e6850/igt@i915_module_load@reload.html

  * igt@kms_frontbuffer_tracking@basic:
    - fi-icl-u2:          [PASS][3] -> [FAIL][4] ([fdo#103167])
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/fi-icl-u2/igt@kms_frontbuffer_tracking@basic.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/fi-icl-u2/igt@kms_frontbuffer_tracking@basic.html

  
#### Possible fixes ####

  * igt@amdgpu/amd_basic@userptr:
    - fi-kbl-8809g:       [DMESG-WARN][5] ([fdo#108965]) -> [PASS][6]
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/fi-kbl-8809g/igt@amdgpu/amd_basic@userptr.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/fi-kbl-8809g/igt@amdgpu/amd_basic@userptr.html

  
#### Warnings ####

  * igt@i915_selftest@live_hangcheck:
    - fi-apl-guc:         [FAIL][7] ([fdo#110623]) -> [INCOMPLETE][8] ([fdo#103927])
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/fi-apl-guc/igt@i915_selftest@live_hangcheck.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/fi-apl-guc/igt@i915_selftest@live_hangcheck.html

  * igt@runner@aborted:
    - fi-apl-guc:         [FAIL][9] ([fdo#110622]) -> [FAIL][10] ([fdo#110624])
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/fi-apl-guc/igt@runner@aborted.html
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/fi-apl-guc/igt@runner@aborted.html

  
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
  [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
  [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
  [fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
  [fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
  [fdo#108965]: https://bugs.freedesktop.org/show_bug.cgi?id=108965
  [fdo#110622]: https://bugs.freedesktop.org/show_bug.cgi?id=110622
  [fdo#110623]: https://bugs.freedesktop.org/show_bug.cgi?id=110623
  [fdo#110624]: https://bugs.freedesktop.org/show_bug.cgi?id=110624


Participating hosts (52 -> 44)
------------------------------

  Missing    (8): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-icl-u3 fi-byt-clapper fi-bdw-samus 


Build changes
-------------

  * Linux: CI_DRM_6097 -> Patchwork_13038

  CI_DRM_6097: 3f2d6a47d9eec66594887b1e9718bc1a29aa6a77 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4996: 6fe5d254ec1b9b47d61408e1b49a7339876bf1e7 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_13038: d90743ac56ec12d0214452a756e4f93f2ed9f923 @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

d90743ac56ec drm/i915: Add state readout for DRM infoframe
b2437ed7bf23 video/hdmi: Add Unpack function for DRM infoframe
d1b22f3edcc9 drm/i915: Added DRM Infoframe handling for BYT/CHT
fb1031c4174f drm/i915:Enabled Modeset when HDR Infoframe changes
40daeee96509 drm/i915: Enable infoframes on GLK+ for HDR
d70fed014469 drm: Add HLG EOTF
0a90660c7a77 drm/i915: Write HDR infoframe and send to panel
17c2cbe44bc2 drm/i915: Attach HDR metadata property to connector
cb262c56a16c drm: Enable HDR infoframe support
9f0d3705e280 drm: Parse HDR metadata info from EDID
325c0bee2297 drm: Add reference counting on HDR metadata blob
67e8b6317a04 drm: Add HDR source metadata property

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 40+ messages in thread

* ✓ Fi.CI.IGT: success for Add HDR Metadata Parsing and handling in DRM layer (rev15)
  2019-05-16 14:10 [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
                   ` (19 preceding siblings ...)
  2019-05-18 10:47 ` ✓ Fi.CI.BAT: success " Patchwork
@ 2019-05-18 15:47 ` Patchwork
  2019-05-22 20:45 ` [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Ville Syrjälä
  2019-05-29  9:43 ` Daniel Vetter
  22 siblings, 0 replies; 40+ messages in thread
From: Patchwork @ 2019-05-18 15:47 UTC (permalink / raw)
  To: Uma Shankar; +Cc: intel-gfx

== Series Details ==

Series: Add HDR Metadata Parsing and handling in DRM layer (rev15)
URL   : https://patchwork.freedesktop.org/series/25091/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_6097_full -> Patchwork_13038_full
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  

Known issues
------------

  Here are the changes found in Patchwork_13038_full that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@gem_eio@in-flight-suspend:
    - shard-kbl:          [PASS][1] -> [FAIL][2] ([fdo#110667])
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-kbl4/igt@gem_eio@in-flight-suspend.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-kbl4/igt@gem_eio@in-flight-suspend.html

  * igt@gem_mmap_gtt@big-copy:
    - shard-iclb:         [PASS][3] -> [INCOMPLETE][4] ([fdo#107713] / [fdo#109100])
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-iclb8/igt@gem_mmap_gtt@big-copy.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-iclb1/igt@gem_mmap_gtt@big-copy.html

  * igt@i915_pm_rpm@system-suspend-modeset:
    - shard-skl:          [PASS][5] -> [INCOMPLETE][6] ([fdo#104108] / [fdo#107807])
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-skl6/igt@i915_pm_rpm@system-suspend-modeset.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-skl4/igt@i915_pm_rpm@system-suspend-modeset.html

  * igt@kms_atomic_transition@plane-toggle-modeset-transition:
    - shard-snb:          [PASS][7] -> [SKIP][8] ([fdo#109271])
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-snb4/igt@kms_atomic_transition@plane-toggle-modeset-transition.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-snb2/igt@kms_atomic_transition@plane-toggle-modeset-transition.html

  * igt@kms_cursor_legacy@2x-flip-vs-cursor-legacy:
    - shard-glk:          [PASS][9] -> [FAIL][10] ([fdo#104873])
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-glk9/igt@kms_cursor_legacy@2x-flip-vs-cursor-legacy.html
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-glk3/igt@kms_cursor_legacy@2x-flip-vs-cursor-legacy.html

  * igt@kms_draw_crc@draw-method-xrgb2101010-render-untiled:
    - shard-skl:          [PASS][11] -> [FAIL][12] ([fdo#103184] / [fdo#103232])
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-skl2/igt@kms_draw_crc@draw-method-xrgb2101010-render-untiled.html
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-skl10/igt@kms_draw_crc@draw-method-xrgb2101010-render-untiled.html

  * igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
    - shard-glk:          [PASS][13] -> [FAIL][14] ([fdo#105363]) +1 similar issue
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-glk5/igt@kms_flip@2x-flip-vs-expired-vblank-interruptible.html
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-glk8/igt@kms_flip@2x-flip-vs-expired-vblank-interruptible.html

  * igt@kms_flip@dpms-vs-vblank-race-interruptible:
    - shard-kbl:          [PASS][15] -> [FAIL][16] ([fdo#103060])
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-kbl4/igt@kms_flip@dpms-vs-vblank-race-interruptible.html
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-kbl4/igt@kms_flip@dpms-vs-vblank-race-interruptible.html

  * igt@kms_flip@flip-vs-expired-vblank:
    - shard-skl:          [PASS][17] -> [FAIL][18] ([fdo#105363])
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-skl9/igt@kms_flip@flip-vs-expired-vblank.html
   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-skl5/igt@kms_flip@flip-vs-expired-vblank.html

  * igt@kms_flip@flip-vs-suspend-interruptible:
    - shard-iclb:         [PASS][19] -> [INCOMPLETE][20] ([fdo#107713] / [fdo#109507])
   [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-iclb5/igt@kms_flip@flip-vs-suspend-interruptible.html
   [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-iclb3/igt@kms_flip@flip-vs-suspend-interruptible.html

  * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-render:
    - shard-iclb:         [PASS][21] -> [FAIL][22] ([fdo#103167]) +6 similar issues
   [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-iclb8/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-render.html
   [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-render.html

  * igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-shrfb-draw-mmap-cpu:
    - shard-skl:          [PASS][23] -> [FAIL][24] ([fdo#103167])
   [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-skl2/igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-shrfb-draw-mmap-cpu.html
   [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-skl10/igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-shrfb-draw-mmap-cpu.html

  * igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
    - shard-apl:          [PASS][25] -> [DMESG-WARN][26] ([fdo#108566]) +2 similar issues
   [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-apl6/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes.html
   [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-apl6/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes.html

  * igt@kms_psr@psr2_dpms:
    - shard-iclb:         [PASS][27] -> [SKIP][28] ([fdo#109441]) +1 similar issue
   [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-iclb2/igt@kms_psr@psr2_dpms.html
   [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-iclb8/igt@kms_psr@psr2_dpms.html

  * igt@kms_setmode@basic:
    - shard-apl:          [PASS][29] -> [FAIL][30] ([fdo#99912])
   [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-apl6/igt@kms_setmode@basic.html
   [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-apl6/igt@kms_setmode@basic.html

  
#### Possible fixes ####

  * igt@gem_tiled_swapping@non-threaded:
    - shard-glk:          [DMESG-WARN][31] ([fdo#108686]) -> [PASS][32]
   [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-glk7/igt@gem_tiled_swapping@non-threaded.html
   [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-glk6/igt@gem_tiled_swapping@non-threaded.html

  * igt@i915_pm_rpm@debugfs-read:
    - shard-skl:          [INCOMPLETE][33] ([fdo#107807]) -> [PASS][34]
   [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-skl3/igt@i915_pm_rpm@debugfs-read.html
   [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-skl3/igt@i915_pm_rpm@debugfs-read.html

  * igt@i915_pm_rpm@gem-execbuf:
    - shard-skl:          [INCOMPLETE][35] ([fdo#107803] / [fdo#107807]) -> [PASS][36]
   [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-skl4/igt@i915_pm_rpm@gem-execbuf.html
   [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-skl4/igt@i915_pm_rpm@gem-execbuf.html

  * igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic:
    - shard-hsw:          [FAIL][37] ([fdo#105767]) -> [PASS][38]
   [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-hsw1/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic.html
   [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-hsw5/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic.html

  * igt@kms_flip@2x-flip-vs-expired-vblank:
    - shard-glk:          [FAIL][39] ([fdo#102887]) -> [PASS][40]
   [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-glk8/igt@kms_flip@2x-flip-vs-expired-vblank.html
   [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-glk6/igt@kms_flip@2x-flip-vs-expired-vblank.html

  * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render:
    - shard-iclb:         [FAIL][41] ([fdo#103167]) -> [PASS][42] +2 similar issues
   [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-iclb8/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
   [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html

  * igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
    - shard-apl:          [DMESG-WARN][43] ([fdo#108566]) -> [PASS][44] +1 similar issue
   [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-apl2/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b.html
   [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-apl3/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b.html

  * igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
    - shard-skl:          [FAIL][45] ([fdo#108145] / [fdo#110403]) -> [PASS][46]
   [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-skl5/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html
   [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-skl3/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html

  * igt@kms_plane_lowres@pipe-a-tiling-y:
    - shard-iclb:         [FAIL][47] ([fdo#103166]) -> [PASS][48]
   [47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-iclb5/igt@kms_plane_lowres@pipe-a-tiling-y.html
   [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-iclb6/igt@kms_plane_lowres@pipe-a-tiling-y.html

  * igt@kms_psr@psr2_cursor_plane_onoff:
    - shard-iclb:         [SKIP][49] ([fdo#109441]) -> [PASS][50] +2 similar issues
   [49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-iclb1/igt@kms_psr@psr2_cursor_plane_onoff.html
   [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-iclb2/igt@kms_psr@psr2_cursor_plane_onoff.html

  * igt@kms_sysfs_edid_timing:
    - shard-iclb:         [FAIL][51] ([fdo#100047]) -> [PASS][52]
   [51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-iclb2/igt@kms_sysfs_edid_timing.html
   [52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-iclb8/igt@kms_sysfs_edid_timing.html

  * igt@syncobj_wait@invalid-signal-illegal-handle:
    - shard-iclb:         [INCOMPLETE][53] ([fdo#107713]) -> [PASS][54]
   [53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-iclb7/igt@syncobj_wait@invalid-signal-illegal-handle.html
   [54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-iclb5/igt@syncobj_wait@invalid-signal-illegal-handle.html

  
#### Warnings ####

  * igt@gem_mmap_gtt@forked-big-copy-xy:
    - shard-iclb:         [INCOMPLETE][55] ([fdo#107713] / [fdo#109100]) -> [TIMEOUT][56] ([fdo#109673])
   [55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-iclb3/igt@gem_mmap_gtt@forked-big-copy-xy.html
   [56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-iclb2/igt@gem_mmap_gtt@forked-big-copy-xy.html

  * igt@i915_pm_rpm@pc8-residency:
    - shard-skl:          [INCOMPLETE][57] ([fdo#107807]) -> [SKIP][58] ([fdo#109271])
   [57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-skl4/igt@i915_pm_rpm@pc8-residency.html
   [58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-skl1/igt@i915_pm_rpm@pc8-residency.html

  * igt@kms_vblank@pipe-c-accuracy-idle:
    - shard-snb:          [SKIP][59] ([fdo#109271] / [fdo#109278]) -> [SKIP][60] ([fdo#109271])
   [59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6097/shard-snb4/igt@kms_vblank@pipe-c-accuracy-idle.html
   [60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/shard-snb2/igt@kms_vblank@pipe-c-accuracy-idle.html

  
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  [fdo#100047]: https://bugs.freedesktop.org/show_bug.cgi?id=100047
  [fdo#102887]: https://bugs.freedesktop.org/show_bug.cgi?id=102887
  [fdo#103060]: https://bugs.freedesktop.org/show_bug.cgi?id=103060
  [fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
  [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
  [fdo#103184]: https://bugs.freedesktop.org/show_bug.cgi?id=103184
  [fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
  [fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
  [fdo#104873]: https://bugs.freedesktop.org/show_bug.cgi?id=104873
  [fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
  [fdo#105767]: https://bugs.freedesktop.org/show_bug.cgi?id=105767
  [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
  [fdo#107803]: https://bugs.freedesktop.org/show_bug.cgi?id=107803
  [fdo#107807]: https://bugs.freedesktop.org/show_bug.cgi?id=107807
  [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
  [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
  [fdo#108686]: https://bugs.freedesktop.org/show_bug.cgi?id=108686
  [fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
  [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
  [fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
  [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
  [fdo#109507]: https://bugs.freedesktop.org/show_bug.cgi?id=109507
  [fdo#109673]: https://bugs.freedesktop.org/show_bug.cgi?id=109673
  [fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
  [fdo#110667]: https://bugs.freedesktop.org/show_bug.cgi?id=110667
  [fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912


Participating hosts (10 -> 10)
------------------------------

  No changes in participating hosts


Build changes
-------------

  * Linux: CI_DRM_6097 -> Patchwork_13038

  CI_DRM_6097: 3f2d6a47d9eec66594887b1e9718bc1a29aa6a77 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4996: 6fe5d254ec1b9b47d61408e1b49a7339876bf1e7 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_13038: d90743ac56ec12d0214452a756e4f93f2ed9f923 @ git://anongit.freedesktop.org/gfx-ci/linux
  piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13038/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer
  2019-05-16 14:10 [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
                   ` (20 preceding siblings ...)
  2019-05-18 15:47 ` ✓ Fi.CI.IGT: " Patchwork
@ 2019-05-22 20:45 ` Ville Syrjälä
  2019-05-23  8:09   ` Jani Nikula
  2019-05-28 11:35   ` Maarten Lankhorst
  2019-05-29  9:43 ` Daniel Vetter
  22 siblings, 2 replies; 40+ messages in thread
From: Ville Syrjälä @ 2019-05-22 20:45 UTC (permalink / raw)
  To: Uma Shankar; +Cc: dcastagna, jonas, intel-gfx, dri-devel, seanpaul

On Thu, May 16, 2019 at 07:40:05PM +0530, Uma Shankar wrote:
> This patch series enables HDR support in drm. It basically defines
> HDR metadata structures, property to pass content (after blending)
> metadata from user space compositors to driver.
> 
> Dynamic Range and Mastering infoframe creation and sending.
> 
> ToDo:
> 1. We need to get the color framework in place for all planes
>    which support HDR content in hardware. This is already in progres
>    and patches are out for review in mailing list.
> 2. UserSpace/Compositors: Blending policies and metadata blob
>    creation and passing to driver. Work is already in progress
>    by Intel's middleware teams on wayland and the patches for
>    the same are in review.
> 
> A POC has already been developed by Ville based on wayland. Please refer
> below link to see the component interactions and usage:
> https://lists.freedesktop.org/archives/wayland-devel/2017-December/036403.html
> 
> v2: Updated Ville's POC changes to the patch series.Incorporated cleanups
> and fixes from Ville. Rebase on latest drm-tip.
> 
> v3: Fixed a warning causing builds to break on CI. No major change.
> 
> v4: Addressed Shashank's review comments.
> 
> v5: Rebase on top of Ville's infoframe refactoring changes. Fixed non modeset
> case for HDR metadata update. Dropped a redundant patch.
> 
> v6: Addressed Shashank's review comments and added RB's received.
> 
> v7: Squashed 2 patches, dropped 1 change and addressed Brian Starkey's and
> Shashank's review comments.
> 
> v8: Addressed Jonas Karlman review comments. Added Shashank's RB to the series,
> fixed a WARN_ON on BYT/CHT.
> 
> v9: Addressed Ville and Jonas Karlman's review comments. Added the infoframe
> state readout and metadata reference count.
> 
> v10: Addressed review comments from Jonas and Ville. Dropped one patch related
> to i915 fastset handling as per Ville's feedback.
> 
> v11: Addressed Ville's review comments.
> 
> Note: v9 version is already tested with Kodi and a confirmation from team kodi has been
> received. Branch details for the same as below:
> https://github.com/xbmc/xbmc/tree/feature_drmprime-vaapi
> 
> v9 of this series is:
> Tested-by: Jonas Karlman <jonas@kwiboo.se>
> 
> Jonas Karlman (1):
>   drm: Add reference counting on HDR metadata blob
> 
> Uma Shankar (9):
>   drm: Add HDR source metadata property
>   drm: Parse HDR metadata info from EDID
>   drm: Enable HDR infoframe support
>   drm/i915: Attach HDR metadata property to connector
>   drm/i915: Write HDR infoframe and send to panel
>   drm/i915:Enabled Modeset when HDR Infoframe changes
>   drm/i915: Added DRM Infoframe handling for BYT/CHT
>   video/hdmi: Add Unpack function for DRM infoframe
>   drm/i915: Add state readout for DRM infoframe
> 
> Ville Syrjälä (2):
>   drm: Add HLG EOTF
>   drm/i915: Enable infoframes on GLK+ for HDR

Pushed the core/etc. bits to drm-misc-next so that other drivers
can base their work on that. We'll need a backmerge to get the
i915 stuff in via dinq.

-- 
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer
  2019-05-22 20:45 ` [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Ville Syrjälä
@ 2019-05-23  8:09   ` Jani Nikula
  2019-05-23  8:41     ` [Intel-gfx] " Daniel Vetter
  2019-05-28 11:35   ` Maarten Lankhorst
  1 sibling, 1 reply; 40+ messages in thread
From: Jani Nikula @ 2019-05-23  8:09 UTC (permalink / raw)
  To: Ville Syrjälä, Uma Shankar
  Cc: dcastagna, jonas, intel-gfx, emil.l.velikov, dri-devel, seanpaul

On Wed, 22 May 2019, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> Pushed the core/etc. bits to drm-misc-next so that other drivers
> can base their work on that. We'll need a backmerge to get the
> i915 stuff in via dinq.

To avoid any confusion, drm-misc-next needs to get merged to drm-next,
which then needs to be backmerged to drm-intel-next-queued. We don't do
merges from drm-misc-next to drm-intel-next-queued directly.

BR,
Jani.


-- 
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [Intel-gfx] [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer
  2019-05-23  8:09   ` Jani Nikula
@ 2019-05-23  8:41     ` Daniel Vetter
  0 siblings, 0 replies; 40+ messages in thread
From: Daniel Vetter @ 2019-05-23  8:41 UTC (permalink / raw)
  To: Jani Nikula; +Cc: dcastagna, jonas, intel-gfx, dri-devel, Uma Shankar, seanpaul

On Thu, May 23, 2019 at 11:09:41AM +0300, Jani Nikula wrote:
> On Wed, 22 May 2019, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> > Pushed the core/etc. bits to drm-misc-next so that other drivers
> > can base their work on that. We'll need a backmerge to get the
> > i915 stuff in via dinq.
> 
> To avoid any confusion, drm-misc-next needs to get merged to drm-next,
> which then needs to be backmerged to drm-intel-next-queued. We don't do
> merges from drm-misc-next to drm-intel-next-queued directly.

Yeah, I mentioned this also on some internal thread for clarification,
just to make it clear that backmerges aren't instant.

There's apparently also confusing about drm-tip, seems like people didn't
know that drm-tip != drm-intel.git and that stuff fromm drm-misc
immediately shows up in drm-tip ...
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer
  2019-05-22 20:45 ` [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Ville Syrjälä
  2019-05-23  8:09   ` Jani Nikula
@ 2019-05-28 11:35   ` Maarten Lankhorst
  2019-05-28 11:43     ` Shankar, Uma
  1 sibling, 1 reply; 40+ messages in thread
From: Maarten Lankhorst @ 2019-05-28 11:35 UTC (permalink / raw)
  To: Ville Syrjälä, Uma Shankar
  Cc: dcastagna, jonas, intel-gfx, dri-devel, seanpaul

Op 22-05-2019 om 22:45 schreef Ville Syrjälä:
> On Thu, May 16, 2019 at 07:40:05PM +0530, Uma Shankar wrote:
>> This patch series enables HDR support in drm. It basically defines
>> HDR metadata structures, property to pass content (after blending)
>> metadata from user space compositors to driver.
>>
>> Dynamic Range and Mastering infoframe creation and sending.
>>
>> ToDo:
>> 1. We need to get the color framework in place for all planes
>>    which support HDR content in hardware. This is already in progres
>>    and patches are out for review in mailing list.
>> 2. UserSpace/Compositors: Blending policies and metadata blob
>>    creation and passing to driver. Work is already in progress
>>    by Intel's middleware teams on wayland and the patches for
>>    the same are in review.
>>
>> A POC has already been developed by Ville based on wayland. Please refer
>> below link to see the component interactions and usage:
>> https://lists.freedesktop.org/archives/wayland-devel/2017-December/036403.html
>>
>> v2: Updated Ville's POC changes to the patch series.Incorporated cleanups
>> and fixes from Ville. Rebase on latest drm-tip.
>>
>> v3: Fixed a warning causing builds to break on CI. No major change.
>>
>> v4: Addressed Shashank's review comments.
>>
>> v5: Rebase on top of Ville's infoframe refactoring changes. Fixed non modeset
>> case for HDR metadata update. Dropped a redundant patch.
>>
>> v6: Addressed Shashank's review comments and added RB's received.
>>
>> v7: Squashed 2 patches, dropped 1 change and addressed Brian Starkey's and
>> Shashank's review comments.
>>
>> v8: Addressed Jonas Karlman review comments. Added Shashank's RB to the series,
>> fixed a WARN_ON on BYT/CHT.
>>
>> v9: Addressed Ville and Jonas Karlman's review comments. Added the infoframe
>> state readout and metadata reference count.
>>
>> v10: Addressed review comments from Jonas and Ville. Dropped one patch related
>> to i915 fastset handling as per Ville's feedback.
>>
>> v11: Addressed Ville's review comments.
>>
>> Note: v9 version is already tested with Kodi and a confirmation from team kodi has been
>> received. Branch details for the same as below:
>> https://github.com/xbmc/xbmc/tree/feature_drmprime-vaapi
>>
>> v9 of this series is:
>> Tested-by: Jonas Karlman <jonas@kwiboo.se>
>>
>> Jonas Karlman (1):
>>   drm: Add reference counting on HDR metadata blob
>>
>> Uma Shankar (9):
>>   drm: Add HDR source metadata property
>>   drm: Parse HDR metadata info from EDID
>>   drm: Enable HDR infoframe support
>>   drm/i915: Attach HDR metadata property to connector
>>   drm/i915: Write HDR infoframe and send to panel
>>   drm/i915:Enabled Modeset when HDR Infoframe changes
>>   drm/i915: Added DRM Infoframe handling for BYT/CHT
>>   video/hdmi: Add Unpack function for DRM infoframe
>>   drm/i915: Add state readout for DRM infoframe
>>
>> Ville Syrjälä (2):
>>   drm: Add HLG EOTF
>>   drm/i915: Enable infoframes on GLK+ for HDR
> Pushed the core/etc. bits to drm-misc-next so that other drivers
> can base their work on that. We'll need a backmerge to get the
> i915 stuff in via dinq.
>
Rest pushed as well. I reordered the series to be slightly more logical, from hw enabling bits to sw enabling bits. :)

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer
  2019-05-28 11:35   ` Maarten Lankhorst
@ 2019-05-28 11:43     ` Shankar, Uma
  0 siblings, 0 replies; 40+ messages in thread
From: Shankar, Uma @ 2019-05-28 11:43 UTC (permalink / raw)
  To: Maarten Lankhorst, Ville Syrjälä
  Cc: dcastagna, jonas, intel-gfx, dri-devel, seanpaul



>-----Original Message-----
>From: Maarten Lankhorst [mailto:maarten.lankhorst@linux.intel.com]
>Sent: Tuesday, May 28, 2019 5:06 PM
>To: Ville Syrjälä <ville.syrjala@linux.intel.com>; Shankar, Uma
><uma.shankar@intel.com>
>Cc: intel-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; Sharma,
>Shashank <shashank.sharma@intel.com>; emil.l.velikov@gmail.com;
>brian.starkey@arm.com; dcastagna@chromium.org; seanpaul@chromium.org;
>Roper, Matthew D <matthew.d.roper@intel.com>; jonas@kwiboo.se
>Subject: Re: [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer
>
>Op 22-05-2019 om 22:45 schreef Ville Syrjälä:
>> On Thu, May 16, 2019 at 07:40:05PM +0530, Uma Shankar wrote:
>>> This patch series enables HDR support in drm. It basically defines
>>> HDR metadata structures, property to pass content (after blending)
>>> metadata from user space compositors to driver.
>>>
>>> Dynamic Range and Mastering infoframe creation and sending.
>>>
>>> ToDo:
>>> 1. We need to get the color framework in place for all planes
>>>    which support HDR content in hardware. This is already in progres
>>>    and patches are out for review in mailing list.
>>> 2. UserSpace/Compositors: Blending policies and metadata blob
>>>    creation and passing to driver. Work is already in progress
>>>    by Intel's middleware teams on wayland and the patches for
>>>    the same are in review.
>>>
>>> A POC has already been developed by Ville based on wayland. Please
>>> refer below link to see the component interactions and usage:
>>> https://lists.freedesktop.org/archives/wayland-devel/2017-December/03
>>> 6403.html
>>>
>>> v2: Updated Ville's POC changes to the patch series.Incorporated
>>> cleanups and fixes from Ville. Rebase on latest drm-tip.
>>>
>>> v3: Fixed a warning causing builds to break on CI. No major change.
>>>
>>> v4: Addressed Shashank's review comments.
>>>
>>> v5: Rebase on top of Ville's infoframe refactoring changes. Fixed non
>>> modeset case for HDR metadata update. Dropped a redundant patch.
>>>
>>> v6: Addressed Shashank's review comments and added RB's received.
>>>
>>> v7: Squashed 2 patches, dropped 1 change and addressed Brian
>>> Starkey's and Shashank's review comments.
>>>
>>> v8: Addressed Jonas Karlman review comments. Added Shashank's RB to
>>> the series, fixed a WARN_ON on BYT/CHT.
>>>
>>> v9: Addressed Ville and Jonas Karlman's review comments. Added the
>>> infoframe state readout and metadata reference count.
>>>
>>> v10: Addressed review comments from Jonas and Ville. Dropped one
>>> patch related to i915 fastset handling as per Ville's feedback.
>>>
>>> v11: Addressed Ville's review comments.
>>>
>>> Note: v9 version is already tested with Kodi and a confirmation from
>>> team kodi has been received. Branch details for the same as below:
>>> https://github.com/xbmc/xbmc/tree/feature_drmprime-vaapi
>>>
>>> v9 of this series is:
>>> Tested-by: Jonas Karlman <jonas@kwiboo.se>
>>>
>>> Jonas Karlman (1):
>>>   drm: Add reference counting on HDR metadata blob
>>>
>>> Uma Shankar (9):
>>>   drm: Add HDR source metadata property
>>>   drm: Parse HDR metadata info from EDID
>>>   drm: Enable HDR infoframe support
>>>   drm/i915: Attach HDR metadata property to connector
>>>   drm/i915: Write HDR infoframe and send to panel
>>>   drm/i915:Enabled Modeset when HDR Infoframe changes
>>>   drm/i915: Added DRM Infoframe handling for BYT/CHT
>>>   video/hdmi: Add Unpack function for DRM infoframe
>>>   drm/i915: Add state readout for DRM infoframe
>>>
>>> Ville Syrjälä (2):
>>>   drm: Add HLG EOTF
>>>   drm/i915: Enable infoframes on GLK+ for HDR
>> Pushed the core/etc. bits to drm-misc-next so that other drivers can
>> base their work on that. We'll need a backmerge to get the
>> i915 stuff in via dinq.
>>
>Rest pushed as well. I reordered the series to be slightly more logical, from hw
>enabling bits to sw enabling bits. :)

Thanks Maarten and Ville for helping with the merge of this series.

Regards,
Uma Shankar

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer
  2019-05-16 14:10 [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
                   ` (21 preceding siblings ...)
  2019-05-22 20:45 ` [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Ville Syrjälä
@ 2019-05-29  9:43 ` Daniel Vetter
  2019-05-29 13:58   ` Shankar, Uma
  22 siblings, 1 reply; 40+ messages in thread
From: Daniel Vetter @ 2019-05-29  9:43 UTC (permalink / raw)
  To: Uma Shankar; +Cc: Daniele Castagna, jonas, intel-gfx, dri-devel, Sean Paul

When building the docs with make htmldocs:

./include/drm/drm_mode_config.h:841: warning: Incorrect use of
kernel-doc format:          * hdr_output_metadata_property: Connector
property containing hdr
./include/drm/drm_mode_config.h:918: warning: Function parameter or
member 'hdr_output_metadata_property' not described in
'drm_mode_config'
./include/drm/drm_connector.h:1251: warning: Function parameter or
member 'hdr_output_metadata' not described in 'drm_connector'
./include/drm/drm_connector.h:1251: warning: Function parameter or
member 'hdr_sink_metadata' not described in 'drm_connector'

Please fix.

In general documentation for this patch seems to be extremely lacking.
No property spec, not docs for most of the new stuff added, no
nothing.

Please fix asap.

Shashank, Ville, this is stuff reviewers must catch.

Thanks, Daniel

On Thu, May 16, 2019 at 3:43 PM Uma Shankar <uma.shankar@intel.com> wrote:
>
> This patch series enables HDR support in drm. It basically defines
> HDR metadata structures, property to pass content (after blending)
> metadata from user space compositors to driver.
>
> Dynamic Range and Mastering infoframe creation and sending.
>
> ToDo:
> 1. We need to get the color framework in place for all planes
>    which support HDR content in hardware. This is already in progres
>    and patches are out for review in mailing list.
> 2. UserSpace/Compositors: Blending policies and metadata blob
>    creation and passing to driver. Work is already in progress
>    by Intel's middleware teams on wayland and the patches for
>    the same are in review.
>
> A POC has already been developed by Ville based on wayland. Please refer
> below link to see the component interactions and usage:
> https://lists.freedesktop.org/archives/wayland-devel/2017-December/036403.html
>
> v2: Updated Ville's POC changes to the patch series.Incorporated cleanups
> and fixes from Ville. Rebase on latest drm-tip.
>
> v3: Fixed a warning causing builds to break on CI. No major change.
>
> v4: Addressed Shashank's review comments.
>
> v5: Rebase on top of Ville's infoframe refactoring changes. Fixed non modeset
> case for HDR metadata update. Dropped a redundant patch.
>
> v6: Addressed Shashank's review comments and added RB's received.
>
> v7: Squashed 2 patches, dropped 1 change and addressed Brian Starkey's and
> Shashank's review comments.
>
> v8: Addressed Jonas Karlman review comments. Added Shashank's RB to the series,
> fixed a WARN_ON on BYT/CHT.
>
> v9: Addressed Ville and Jonas Karlman's review comments. Added the infoframe
> state readout and metadata reference count.
>
> v10: Addressed review comments from Jonas and Ville. Dropped one patch related
> to i915 fastset handling as per Ville's feedback.
>
> v11: Addressed Ville's review comments.
>
> Note: v9 version is already tested with Kodi and a confirmation from team kodi has been
> received. Branch details for the same as below:
> https://github.com/xbmc/xbmc/tree/feature_drmprime-vaapi
>
> v9 of this series is:
> Tested-by: Jonas Karlman <jonas@kwiboo.se>
>
> Jonas Karlman (1):
>   drm: Add reference counting on HDR metadata blob
>
> Uma Shankar (9):
>   drm: Add HDR source metadata property
>   drm: Parse HDR metadata info from EDID
>   drm: Enable HDR infoframe support
>   drm/i915: Attach HDR metadata property to connector
>   drm/i915: Write HDR infoframe and send to panel
>   drm/i915:Enabled Modeset when HDR Infoframe changes
>   drm/i915: Added DRM Infoframe handling for BYT/CHT
>   video/hdmi: Add Unpack function for DRM infoframe
>   drm/i915: Add state readout for DRM infoframe
>
> Ville Syrjälä (2):
>   drm: Add HLG EOTF
>   drm/i915: Enable infoframes on GLK+ for HDR
>
>  drivers/gpu/drm/drm_atomic_state_helper.c |   5 +
>  drivers/gpu/drm/drm_atomic_uapi.c         |  12 ++
>  drivers/gpu/drm/drm_connector.c           |   6 +
>  drivers/gpu/drm/drm_edid.c                | 124 ++++++++++++++
>  drivers/gpu/drm/i915/i915_reg.h           |   4 +
>  drivers/gpu/drm/i915/intel_atomic.c       |  14 +-
>  drivers/gpu/drm/i915/intel_ddi.c          |   3 +
>  drivers/gpu/drm/i915/intel_display.c      |   1 +
>  drivers/gpu/drm/i915/intel_drv.h          |   1 +
>  drivers/gpu/drm/i915/intel_hdmi.c         |  67 +++++++-
>  drivers/video/hdmi.c                      | 257 ++++++++++++++++++++++++++++++
>  include/drm/drm_connector.h               |  10 ++
>  include/drm/drm_edid.h                    |   5 +
>  include/drm/drm_mode_config.h             |   7 +
>  include/linux/hdmi.h                      |  55 +++++++
>  include/uapi/drm/drm_mode.h               |  23 +++
>  16 files changed, 589 insertions(+), 5 deletions(-)
>
> --
> 1.9.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx



-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer
  2019-05-29  9:43 ` Daniel Vetter
@ 2019-05-29 13:58   ` Shankar, Uma
  2019-05-29 15:03     ` [Intel-gfx] " Daniel Vetter
  0 siblings, 1 reply; 40+ messages in thread
From: Shankar, Uma @ 2019-05-29 13:58 UTC (permalink / raw)
  To: Daniel Vetter; +Cc: Daniele Castagna, jonas, intel-gfx, dri-devel, Sean Paul



>-----Original Message-----
>From: Daniel Vetter [mailto:daniel@ffwll.ch]
>Sent: Wednesday, May 29, 2019 3:13 PM
>To: Shankar, Uma <uma.shankar@intel.com>
>Cc: intel-gfx <intel-gfx@lists.freedesktop.org>; dri-devel <dri-
>devel@lists.freedesktop.org>; Daniele Castagna <dcastagna@chromium.org>;
>jonas@kwiboo.se; Sean Paul <seanpaul@chromium.org>; Sharma, Shashank
><shashank.sharma@intel.com>; Syrjala, Ville <ville.syrjala@linux.intel.com>
>Subject: Re: [Intel-gfx] [v11 00/12] Add HDR Metadata Parsing and handling in DRM
>layer
>
>When building the docs with make htmldocs:
>
>./include/drm/drm_mode_config.h:841: warning: Incorrect use of
>kernel-doc format:          * hdr_output_metadata_property: Connector
>property containing hdr
>./include/drm/drm_mode_config.h:918: warning: Function parameter or member
>'hdr_output_metadata_property' not described in 'drm_mode_config'
>./include/drm/drm_connector.h:1251: warning: Function parameter or member
>'hdr_output_metadata' not described in 'drm_connector'
>./include/drm/drm_connector.h:1251: warning: Function parameter or member
>'hdr_sink_metadata' not described in 'drm_connector'
>
>Please fix.

Thanks Daniel, I missed to check the docs warnings. Will fix this.

>In general documentation for this patch seems to be extremely lacking.
>No property spec, not docs for most of the new stuff added, no nothing.

Will add the property description in connector create properties as well.

>Please fix asap.

Yeah, will send out the doc fix patch soon.

Regards,
Uma Shankar

>Shashank, Ville, this is stuff reviewers must catch.
>
>Thanks, Daniel
>
>On Thu, May 16, 2019 at 3:43 PM Uma Shankar <uma.shankar@intel.com> wrote:
>>
>> This patch series enables HDR support in drm. It basically defines HDR
>> metadata structures, property to pass content (after blending)
>> metadata from user space compositors to driver.
>>
>> Dynamic Range and Mastering infoframe creation and sending.
>>
>> ToDo:
>> 1. We need to get the color framework in place for all planes
>>    which support HDR content in hardware. This is already in progres
>>    and patches are out for review in mailing list.
>> 2. UserSpace/Compositors: Blending policies and metadata blob
>>    creation and passing to driver. Work is already in progress
>>    by Intel's middleware teams on wayland and the patches for
>>    the same are in review.
>>
>> A POC has already been developed by Ville based on wayland. Please
>> refer below link to see the component interactions and usage:
>> https://lists.freedesktop.org/archives/wayland-devel/2017-December/036
>> 403.html
>>
>> v2: Updated Ville's POC changes to the patch series.Incorporated
>> cleanups and fixes from Ville. Rebase on latest drm-tip.
>>
>> v3: Fixed a warning causing builds to break on CI. No major change.
>>
>> v4: Addressed Shashank's review comments.
>>
>> v5: Rebase on top of Ville's infoframe refactoring changes. Fixed non
>> modeset case for HDR metadata update. Dropped a redundant patch.
>>
>> v6: Addressed Shashank's review comments and added RB's received.
>>
>> v7: Squashed 2 patches, dropped 1 change and addressed Brian Starkey's
>> and Shashank's review comments.
>>
>> v8: Addressed Jonas Karlman review comments. Added Shashank's RB to
>> the series, fixed a WARN_ON on BYT/CHT.
>>
>> v9: Addressed Ville and Jonas Karlman's review comments. Added the
>> infoframe state readout and metadata reference count.
>>
>> v10: Addressed review comments from Jonas and Ville. Dropped one patch
>> related to i915 fastset handling as per Ville's feedback.
>>
>> v11: Addressed Ville's review comments.
>>
>> Note: v9 version is already tested with Kodi and a confirmation from
>> team kodi has been received. Branch details for the same as below:
>> https://github.com/xbmc/xbmc/tree/feature_drmprime-vaapi
>>
>> v9 of this series is:
>> Tested-by: Jonas Karlman <jonas@kwiboo.se>
>>
>> Jonas Karlman (1):
>>   drm: Add reference counting on HDR metadata blob
>>
>> Uma Shankar (9):
>>   drm: Add HDR source metadata property
>>   drm: Parse HDR metadata info from EDID
>>   drm: Enable HDR infoframe support
>>   drm/i915: Attach HDR metadata property to connector
>>   drm/i915: Write HDR infoframe and send to panel
>>   drm/i915:Enabled Modeset when HDR Infoframe changes
>>   drm/i915: Added DRM Infoframe handling for BYT/CHT
>>   video/hdmi: Add Unpack function for DRM infoframe
>>   drm/i915: Add state readout for DRM infoframe
>>
>> Ville Syrjälä (2):
>>   drm: Add HLG EOTF
>>   drm/i915: Enable infoframes on GLK+ for HDR
>>
>>  drivers/gpu/drm/drm_atomic_state_helper.c |   5 +
>>  drivers/gpu/drm/drm_atomic_uapi.c         |  12 ++
>>  drivers/gpu/drm/drm_connector.c           |   6 +
>>  drivers/gpu/drm/drm_edid.c                | 124 ++++++++++++++
>>  drivers/gpu/drm/i915/i915_reg.h           |   4 +
>>  drivers/gpu/drm/i915/intel_atomic.c       |  14 +-
>>  drivers/gpu/drm/i915/intel_ddi.c          |   3 +
>>  drivers/gpu/drm/i915/intel_display.c      |   1 +
>>  drivers/gpu/drm/i915/intel_drv.h          |   1 +
>>  drivers/gpu/drm/i915/intel_hdmi.c         |  67 +++++++-
>>  drivers/video/hdmi.c                      | 257 ++++++++++++++++++++++++++++++
>>  include/drm/drm_connector.h               |  10 ++
>>  include/drm/drm_edid.h                    |   5 +
>>  include/drm/drm_mode_config.h             |   7 +
>>  include/linux/hdmi.h                      |  55 +++++++
>>  include/uapi/drm/drm_mode.h               |  23 +++
>>  16 files changed, 589 insertions(+), 5 deletions(-)
>>
>> --
>> 1.9.1
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
>
>
>--
>Daniel Vetter
>Software Engineer, Intel Corporation
>+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [Intel-gfx] [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer
  2019-05-29 13:58   ` Shankar, Uma
@ 2019-05-29 15:03     ` Daniel Vetter
  2019-05-29 17:28       ` Shankar, Uma
  0 siblings, 1 reply; 40+ messages in thread
From: Daniel Vetter @ 2019-05-29 15:03 UTC (permalink / raw)
  To: Shankar, Uma; +Cc: Daniele Castagna, jonas, intel-gfx, dri-devel, Sean Paul

On Wed, May 29, 2019 at 3:59 PM Shankar, Uma <uma.shankar@intel.com> wrote:
>
>
>
> >-----Original Message-----
> >From: Daniel Vetter [mailto:daniel@ffwll.ch]
> >Sent: Wednesday, May 29, 2019 3:13 PM
> >To: Shankar, Uma <uma.shankar@intel.com>
> >Cc: intel-gfx <intel-gfx@lists.freedesktop.org>; dri-devel <dri-
> >devel@lists.freedesktop.org>; Daniele Castagna <dcastagna@chromium.org>;
> >jonas@kwiboo.se; Sean Paul <seanpaul@chromium.org>; Sharma, Shashank
> ><shashank.sharma@intel.com>; Syrjala, Ville <ville.syrjala@linux.intel.com>
> >Subject: Re: [Intel-gfx] [v11 00/12] Add HDR Metadata Parsing and handling in DRM
> >layer
> >
> >When building the docs with make htmldocs:
> >
> >./include/drm/drm_mode_config.h:841: warning: Incorrect use of
> >kernel-doc format:          * hdr_output_metadata_property: Connector
> >property containing hdr
> >./include/drm/drm_mode_config.h:918: warning: Function parameter or member
> >'hdr_output_metadata_property' not described in 'drm_mode_config'
> >./include/drm/drm_connector.h:1251: warning: Function parameter or member
> >'hdr_output_metadata' not described in 'drm_connector'
> >./include/drm/drm_connector.h:1251: warning: Function parameter or member
> >'hdr_sink_metadata' not described in 'drm_connector'
> >
> >Please fix.
>
> Thanks Daniel, I missed to check the docs warnings. Will fix this.
>
> >In general documentation for this patch seems to be extremely lacking.
> >No property spec, not docs for most of the new stuff added, no nothing.
>
> Will add the property description in connector create properties as well.
>
> >Please fix asap.
>
> Yeah, will send out the doc fix patch soon.

btw I think the hdmi infoframe helper docs also need more polish.
Generally we only document the driver interface, formal kerneldoc
comments for static functions is overkill. I think you added some of
those.

If you feel like a comment is needed, sure do that, but just a plain
comment. Always worth it to make sure that the documentation you're
typing actually shows up in the output, and correctly. If it doesn't,
then there's something to improve.

Can you pls also take a look at that?

Thanks, Daniel
>
> Regards,
> Uma Shankar
>
> >Shashank, Ville, this is stuff reviewers must catch.
> >
> >Thanks, Daniel
> >
> >On Thu, May 16, 2019 at 3:43 PM Uma Shankar <uma.shankar@intel.com> wrote:
> >>
> >> This patch series enables HDR support in drm. It basically defines HDR
> >> metadata structures, property to pass content (after blending)
> >> metadata from user space compositors to driver.
> >>
> >> Dynamic Range and Mastering infoframe creation and sending.
> >>
> >> ToDo:
> >> 1. We need to get the color framework in place for all planes
> >>    which support HDR content in hardware. This is already in progres
> >>    and patches are out for review in mailing list.
> >> 2. UserSpace/Compositors: Blending policies and metadata blob
> >>    creation and passing to driver. Work is already in progress
> >>    by Intel's middleware teams on wayland and the patches for
> >>    the same are in review.
> >>
> >> A POC has already been developed by Ville based on wayland. Please
> >> refer below link to see the component interactions and usage:
> >> https://lists.freedesktop.org/archives/wayland-devel/2017-December/036
> >> 403.html
> >>
> >> v2: Updated Ville's POC changes to the patch series.Incorporated
> >> cleanups and fixes from Ville. Rebase on latest drm-tip.
> >>
> >> v3: Fixed a warning causing builds to break on CI. No major change.
> >>
> >> v4: Addressed Shashank's review comments.
> >>
> >> v5: Rebase on top of Ville's infoframe refactoring changes. Fixed non
> >> modeset case for HDR metadata update. Dropped a redundant patch.
> >>
> >> v6: Addressed Shashank's review comments and added RB's received.
> >>
> >> v7: Squashed 2 patches, dropped 1 change and addressed Brian Starkey's
> >> and Shashank's review comments.
> >>
> >> v8: Addressed Jonas Karlman review comments. Added Shashank's RB to
> >> the series, fixed a WARN_ON on BYT/CHT.
> >>
> >> v9: Addressed Ville and Jonas Karlman's review comments. Added the
> >> infoframe state readout and metadata reference count.
> >>
> >> v10: Addressed review comments from Jonas and Ville. Dropped one patch
> >> related to i915 fastset handling as per Ville's feedback.
> >>
> >> v11: Addressed Ville's review comments.
> >>
> >> Note: v9 version is already tested with Kodi and a confirmation from
> >> team kodi has been received. Branch details for the same as below:
> >> https://github.com/xbmc/xbmc/tree/feature_drmprime-vaapi
> >>
> >> v9 of this series is:
> >> Tested-by: Jonas Karlman <jonas@kwiboo.se>
> >>
> >> Jonas Karlman (1):
> >>   drm: Add reference counting on HDR metadata blob
> >>
> >> Uma Shankar (9):
> >>   drm: Add HDR source metadata property
> >>   drm: Parse HDR metadata info from EDID
> >>   drm: Enable HDR infoframe support
> >>   drm/i915: Attach HDR metadata property to connector
> >>   drm/i915: Write HDR infoframe and send to panel
> >>   drm/i915:Enabled Modeset when HDR Infoframe changes
> >>   drm/i915: Added DRM Infoframe handling for BYT/CHT
> >>   video/hdmi: Add Unpack function for DRM infoframe
> >>   drm/i915: Add state readout for DRM infoframe
> >>
> >> Ville Syrjälä (2):
> >>   drm: Add HLG EOTF
> >>   drm/i915: Enable infoframes on GLK+ for HDR
> >>
> >>  drivers/gpu/drm/drm_atomic_state_helper.c |   5 +
> >>  drivers/gpu/drm/drm_atomic_uapi.c         |  12 ++
> >>  drivers/gpu/drm/drm_connector.c           |   6 +
> >>  drivers/gpu/drm/drm_edid.c                | 124 ++++++++++++++
> >>  drivers/gpu/drm/i915/i915_reg.h           |   4 +
> >>  drivers/gpu/drm/i915/intel_atomic.c       |  14 +-
> >>  drivers/gpu/drm/i915/intel_ddi.c          |   3 +
> >>  drivers/gpu/drm/i915/intel_display.c      |   1 +
> >>  drivers/gpu/drm/i915/intel_drv.h          |   1 +
> >>  drivers/gpu/drm/i915/intel_hdmi.c         |  67 +++++++-
> >>  drivers/video/hdmi.c                      | 257 ++++++++++++++++++++++++++++++
> >>  include/drm/drm_connector.h               |  10 ++
> >>  include/drm/drm_edid.h                    |   5 +
> >>  include/drm/drm_mode_config.h             |   7 +
> >>  include/linux/hdmi.h                      |  55 +++++++
> >>  include/uapi/drm/drm_mode.h               |  23 +++
> >>  16 files changed, 589 insertions(+), 5 deletions(-)
> >>
> >> --
> >> 1.9.1
> >>
> >> _______________________________________________
> >> Intel-gfx mailing list
> >> Intel-gfx@lists.freedesktop.org
> >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> >
> >
> >
> >--
> >Daniel Vetter
> >Software Engineer, Intel Corporation
> >+41 (0) 79 365 57 48 - http://blog.ffwll.ch



-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 40+ messages in thread

* RE: [Intel-gfx] [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer
  2019-05-29 15:03     ` [Intel-gfx] " Daniel Vetter
@ 2019-05-29 17:28       ` Shankar, Uma
  2019-05-29 17:35         ` Daniel Vetter
  0 siblings, 1 reply; 40+ messages in thread
From: Shankar, Uma @ 2019-05-29 17:28 UTC (permalink / raw)
  To: Daniel Vetter; +Cc: Daniele Castagna, jonas, intel-gfx, dri-devel, Sean Paul



>-----Original Message-----
>From: Daniel Vetter [mailto:daniel@ffwll.ch]
>Sent: Wednesday, May 29, 2019 8:33 PM
>To: Shankar, Uma <uma.shankar@intel.com>
>Cc: intel-gfx <intel-gfx@lists.freedesktop.org>; dri-devel <dri-
>devel@lists.freedesktop.org>; Daniele Castagna <dcastagna@chromium.org>;
>jonas@kwiboo.se; Sean Paul <seanpaul@chromium.org>; Sharma, Shashank
><shashank.sharma@intel.com>; Syrjala, Ville <ville.syrjala@linux.intel.com>
>Subject: Re: [Intel-gfx] [v11 00/12] Add HDR Metadata Parsing and handling in DRM
>layer
>
>On Wed, May 29, 2019 at 3:59 PM Shankar, Uma <uma.shankar@intel.com> wrote:
>>
>>
>>
>> >-----Original Message-----
>> >From: Daniel Vetter [mailto:daniel@ffwll.ch]
>> >Sent: Wednesday, May 29, 2019 3:13 PM
>> >To: Shankar, Uma <uma.shankar@intel.com>
>> >Cc: intel-gfx <intel-gfx@lists.freedesktop.org>; dri-devel <dri-
>> >devel@lists.freedesktop.org>; Daniele Castagna
>> ><dcastagna@chromium.org>; jonas@kwiboo.se; Sean Paul
>> ><seanpaul@chromium.org>; Sharma, Shashank
>> ><shashank.sharma@intel.com>; Syrjala, Ville
>> ><ville.syrjala@linux.intel.com>
>> >Subject: Re: [Intel-gfx] [v11 00/12] Add HDR Metadata Parsing and
>> >handling in DRM layer
>> >
>> >When building the docs with make htmldocs:
>> >
>> >./include/drm/drm_mode_config.h:841: warning: Incorrect use of
>> >kernel-doc format:          * hdr_output_metadata_property: Connector
>> >property containing hdr
>> >./include/drm/drm_mode_config.h:918: warning: Function parameter or
>> >member 'hdr_output_metadata_property' not described in 'drm_mode_config'
>> >./include/drm/drm_connector.h:1251: warning: Function parameter or
>> >member 'hdr_output_metadata' not described in 'drm_connector'
>> >./include/drm/drm_connector.h:1251: warning: Function parameter or
>> >member 'hdr_sink_metadata' not described in 'drm_connector'
>> >
>> >Please fix.
>>
>> Thanks Daniel, I missed to check the docs warnings. Will fix this.
>>
>> >In general documentation for this patch seems to be extremely lacking.
>> >No property spec, not docs for most of the new stuff added, no nothing.
>>
>> Will add the property description in connector create properties as well.
>>
>> >Please fix asap.
>>
>> Yeah, will send out the doc fix patch soon.
>
>btw I think the hdmi infoframe helper docs also need more polish.
>Generally we only document the driver interface, formal kerneldoc comments for
>static functions is overkill. I think you added some of those.

Hi Daniel,
I tried to stay consistent with how the existing stuff was handled here. So yes, it got
added as part of this as well. May be I will drop it for HDR stuff without disturbing the
legacy stuff. Hope this is fine ?

Regards,
Uma Shankar

>If you feel like a comment is needed, sure do that, but just a plain comment. Always
>worth it to make sure that the documentation you're typing actually shows up in the
>output, and correctly. If it doesn't, then there's something to improve.
>
>Can you pls also take a look at that?
>
>Thanks, Daniel
>>
>> Regards,
>> Uma Shankar
>>
>> >Shashank, Ville, this is stuff reviewers must catch.
>> >
>> >Thanks, Daniel
>> >
>> >On Thu, May 16, 2019 at 3:43 PM Uma Shankar <uma.shankar@intel.com> wrote:
>> >>
>> >> This patch series enables HDR support in drm. It basically defines
>> >> HDR metadata structures, property to pass content (after blending)
>> >> metadata from user space compositors to driver.
>> >>
>> >> Dynamic Range and Mastering infoframe creation and sending.
>> >>
>> >> ToDo:
>> >> 1. We need to get the color framework in place for all planes
>> >>    which support HDR content in hardware. This is already in progres
>> >>    and patches are out for review in mailing list.
>> >> 2. UserSpace/Compositors: Blending policies and metadata blob
>> >>    creation and passing to driver. Work is already in progress
>> >>    by Intel's middleware teams on wayland and the patches for
>> >>    the same are in review.
>> >>
>> >> A POC has already been developed by Ville based on wayland. Please
>> >> refer below link to see the component interactions and usage:
>> >> https://lists.freedesktop.org/archives/wayland-devel/2017-December/
>> >> 036
>> >> 403.html
>> >>
>> >> v2: Updated Ville's POC changes to the patch series.Incorporated
>> >> cleanups and fixes from Ville. Rebase on latest drm-tip.
>> >>
>> >> v3: Fixed a warning causing builds to break on CI. No major change.
>> >>
>> >> v4: Addressed Shashank's review comments.
>> >>
>> >> v5: Rebase on top of Ville's infoframe refactoring changes. Fixed
>> >> non modeset case for HDR metadata update. Dropped a redundant patch.
>> >>
>> >> v6: Addressed Shashank's review comments and added RB's received.
>> >>
>> >> v7: Squashed 2 patches, dropped 1 change and addressed Brian
>> >> Starkey's and Shashank's review comments.
>> >>
>> >> v8: Addressed Jonas Karlman review comments. Added Shashank's RB to
>> >> the series, fixed a WARN_ON on BYT/CHT.
>> >>
>> >> v9: Addressed Ville and Jonas Karlman's review comments. Added the
>> >> infoframe state readout and metadata reference count.
>> >>
>> >> v10: Addressed review comments from Jonas and Ville. Dropped one
>> >> patch related to i915 fastset handling as per Ville's feedback.
>> >>
>> >> v11: Addressed Ville's review comments.
>> >>
>> >> Note: v9 version is already tested with Kodi and a confirmation
>> >> from team kodi has been received. Branch details for the same as below:
>> >> https://github.com/xbmc/xbmc/tree/feature_drmprime-vaapi
>> >>
>> >> v9 of this series is:
>> >> Tested-by: Jonas Karlman <jonas@kwiboo.se>
>> >>
>> >> Jonas Karlman (1):
>> >>   drm: Add reference counting on HDR metadata blob
>> >>
>> >> Uma Shankar (9):
>> >>   drm: Add HDR source metadata property
>> >>   drm: Parse HDR metadata info from EDID
>> >>   drm: Enable HDR infoframe support
>> >>   drm/i915: Attach HDR metadata property to connector
>> >>   drm/i915: Write HDR infoframe and send to panel
>> >>   drm/i915:Enabled Modeset when HDR Infoframe changes
>> >>   drm/i915: Added DRM Infoframe handling for BYT/CHT
>> >>   video/hdmi: Add Unpack function for DRM infoframe
>> >>   drm/i915: Add state readout for DRM infoframe
>> >>
>> >> Ville Syrjälä (2):
>> >>   drm: Add HLG EOTF
>> >>   drm/i915: Enable infoframes on GLK+ for HDR
>> >>
>> >>  drivers/gpu/drm/drm_atomic_state_helper.c |   5 +
>> >>  drivers/gpu/drm/drm_atomic_uapi.c         |  12 ++
>> >>  drivers/gpu/drm/drm_connector.c           |   6 +
>> >>  drivers/gpu/drm/drm_edid.c                | 124 ++++++++++++++
>> >>  drivers/gpu/drm/i915/i915_reg.h           |   4 +
>> >>  drivers/gpu/drm/i915/intel_atomic.c       |  14 +-
>> >>  drivers/gpu/drm/i915/intel_ddi.c          |   3 +
>> >>  drivers/gpu/drm/i915/intel_display.c      |   1 +
>> >>  drivers/gpu/drm/i915/intel_drv.h          |   1 +
>> >>  drivers/gpu/drm/i915/intel_hdmi.c         |  67 +++++++-
>> >>  drivers/video/hdmi.c                      | 257 ++++++++++++++++++++++++++++++
>> >>  include/drm/drm_connector.h               |  10 ++
>> >>  include/drm/drm_edid.h                    |   5 +
>> >>  include/drm/drm_mode_config.h             |   7 +
>> >>  include/linux/hdmi.h                      |  55 +++++++
>> >>  include/uapi/drm/drm_mode.h               |  23 +++
>> >>  16 files changed, 589 insertions(+), 5 deletions(-)
>> >>
>> >> --
>> >> 1.9.1
>> >>
>> >> _______________________________________________
>> >> Intel-gfx mailing list
>> >> Intel-gfx@lists.freedesktop.org
>> >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>> >
>> >
>> >
>> >--
>> >Daniel Vetter
>> >Software Engineer, Intel Corporation
>> >+41 (0) 79 365 57 48 - http://blog.ffwll.ch
>
>
>
>--
>Daniel Vetter
>Software Engineer, Intel Corporation
>+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 40+ messages in thread

* Re: [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer
  2019-05-29 17:28       ` Shankar, Uma
@ 2019-05-29 17:35         ` Daniel Vetter
  2019-05-29 17:39           ` [Intel-gfx] " Shankar, Uma
  0 siblings, 1 reply; 40+ messages in thread
From: Daniel Vetter @ 2019-05-29 17:35 UTC (permalink / raw)
  To: Shankar, Uma; +Cc: Daniele Castagna, jonas, intel-gfx, dri-devel, Sean Paul

On Wed, May 29, 2019 at 7:29 PM Shankar, Uma <uma.shankar@intel.com> wrote:
>
>
>
> >-----Original Message-----
> >From: Daniel Vetter [mailto:daniel@ffwll.ch]
> >Sent: Wednesday, May 29, 2019 8:33 PM
> >To: Shankar, Uma <uma.shankar@intel.com>
> >Cc: intel-gfx <intel-gfx@lists.freedesktop.org>; dri-devel <dri-
> >devel@lists.freedesktop.org>; Daniele Castagna <dcastagna@chromium.org>;
> >jonas@kwiboo.se; Sean Paul <seanpaul@chromium.org>; Sharma, Shashank
> ><shashank.sharma@intel.com>; Syrjala, Ville <ville.syrjala@linux.intel.com>
> >Subject: Re: [Intel-gfx] [v11 00/12] Add HDR Metadata Parsing and handling in DRM
> >layer
> >
> >On Wed, May 29, 2019 at 3:59 PM Shankar, Uma <uma.shankar@intel.com> wrote:
> >>
> >>
> >>
> >> >-----Original Message-----
> >> >From: Daniel Vetter [mailto:daniel@ffwll.ch]
> >> >Sent: Wednesday, May 29, 2019 3:13 PM
> >> >To: Shankar, Uma <uma.shankar@intel.com>
> >> >Cc: intel-gfx <intel-gfx@lists.freedesktop.org>; dri-devel <dri-
> >> >devel@lists.freedesktop.org>; Daniele Castagna
> >> ><dcastagna@chromium.org>; jonas@kwiboo.se; Sean Paul
> >> ><seanpaul@chromium.org>; Sharma, Shashank
> >> ><shashank.sharma@intel.com>; Syrjala, Ville
> >> ><ville.syrjala@linux.intel.com>
> >> >Subject: Re: [Intel-gfx] [v11 00/12] Add HDR Metadata Parsing and
> >> >handling in DRM layer
> >> >
> >> >When building the docs with make htmldocs:
> >> >
> >> >./include/drm/drm_mode_config.h:841: warning: Incorrect use of
> >> >kernel-doc format:          * hdr_output_metadata_property: Connector
> >> >property containing hdr
> >> >./include/drm/drm_mode_config.h:918: warning: Function parameter or
> >> >member 'hdr_output_metadata_property' not described in 'drm_mode_config'
> >> >./include/drm/drm_connector.h:1251: warning: Function parameter or
> >> >member 'hdr_output_metadata' not described in 'drm_connector'
> >> >./include/drm/drm_connector.h:1251: warning: Function parameter or
> >> >member 'hdr_sink_metadata' not described in 'drm_connector'
> >> >
> >> >Please fix.
> >>
> >> Thanks Daniel, I missed to check the docs warnings. Will fix this.
> >>
> >> >In general documentation for this patch seems to be extremely lacking.
> >> >No property spec, not docs for most of the new stuff added, no nothing.
> >>
> >> Will add the property description in connector create properties as well.
> >>
> >> >Please fix asap.
> >>
> >> Yeah, will send out the doc fix patch soon.
> >
> >btw I think the hdmi infoframe helper docs also need more polish.
> >Generally we only document the driver interface, formal kerneldoc comments for
> >static functions is overkill. I think you added some of those.
>
> Hi Daniel,
> I tried to stay consistent with how the existing stuff was handled here. So yes, it got
> added as part of this as well. May be I will drop it for HDR stuff without disturbing the
> legacy stuff. Hope this is fine ?

There's just one patch before yours that adds kerneldoc to static inline:

commit 2c676f378edb16cb68f7815581c8119fc43a4b85
Author: Martin Bugge <marbugge@cisco.com>
Date:   Fri Dec 19 09:14:21 2014 -0300

    [media] hdmi: added unpack and logging functions for InfoFrames

That one didn't go through dri-devel I think. None of the other static
functions are documented.

I think a patch to remove those (and maybe just have simple comments,
but doesn't look like anything fancy that's not already obvious) makes
sense here.

I'm also working on some patches to document drm subsystem
documentation rules better going forward.
-Daniel

>
> Regards,
> Uma Shankar
>
> >If you feel like a comment is needed, sure do that, but just a plain comment. Always
> >worth it to make sure that the documentation you're typing actually shows up in the
> >output, and correctly. If it doesn't, then there's something to improve.
> >
> >Can you pls also take a look at that?
> >
> >Thanks, Daniel
> >>
> >> Regards,
> >> Uma Shankar
> >>
> >> >Shashank, Ville, this is stuff reviewers must catch.
> >> >
> >> >Thanks, Daniel
> >> >
> >> >On Thu, May 16, 2019 at 3:43 PM Uma Shankar <uma.shankar@intel.com> wrote:
> >> >>
> >> >> This patch series enables HDR support in drm. It basically defines
> >> >> HDR metadata structures, property to pass content (after blending)
> >> >> metadata from user space compositors to driver.
> >> >>
> >> >> Dynamic Range and Mastering infoframe creation and sending.
> >> >>
> >> >> ToDo:
> >> >> 1. We need to get the color framework in place for all planes
> >> >>    which support HDR content in hardware. This is already in progres
> >> >>    and patches are out for review in mailing list.
> >> >> 2. UserSpace/Compositors: Blending policies and metadata blob
> >> >>    creation and passing to driver. Work is already in progress
> >> >>    by Intel's middleware teams on wayland and the patches for
> >> >>    the same are in review.
> >> >>
> >> >> A POC has already been developed by Ville based on wayland. Please
> >> >> refer below link to see the component interactions and usage:
> >> >> https://lists.freedesktop.org/archives/wayland-devel/2017-December/
> >> >> 036
> >> >> 403.html
> >> >>
> >> >> v2: Updated Ville's POC changes to the patch series.Incorporated
> >> >> cleanups and fixes from Ville. Rebase on latest drm-tip.
> >> >>
> >> >> v3: Fixed a warning causing builds to break on CI. No major change.
> >> >>
> >> >> v4: Addressed Shashank's review comments.
> >> >>
> >> >> v5: Rebase on top of Ville's infoframe refactoring changes. Fixed
> >> >> non modeset case for HDR metadata update. Dropped a redundant patch.
> >> >>
> >> >> v6: Addressed Shashank's review comments and added RB's received.
> >> >>
> >> >> v7: Squashed 2 patches, dropped 1 change and addressed Brian
> >> >> Starkey's and Shashank's review comments.
> >> >>
> >> >> v8: Addressed Jonas Karlman review comments. Added Shashank's RB to
> >> >> the series, fixed a WARN_ON on BYT/CHT.
> >> >>
> >> >> v9: Addressed Ville and Jonas Karlman's review comments. Added the
> >> >> infoframe state readout and metadata reference count.
> >> >>
> >> >> v10: Addressed review comments from Jonas and Ville. Dropped one
> >> >> patch related to i915 fastset handling as per Ville's feedback.
> >> >>
> >> >> v11: Addressed Ville's review comments.
> >> >>
> >> >> Note: v9 version is already tested with Kodi and a confirmation
> >> >> from team kodi has been received. Branch details for the same as below:
> >> >> https://github.com/xbmc/xbmc/tree/feature_drmprime-vaapi
> >> >>
> >> >> v9 of this series is:
> >> >> Tested-by: Jonas Karlman <jonas@kwiboo.se>
> >> >>
> >> >> Jonas Karlman (1):
> >> >>   drm: Add reference counting on HDR metadata blob
> >> >>
> >> >> Uma Shankar (9):
> >> >>   drm: Add HDR source metadata property
> >> >>   drm: Parse HDR metadata info from EDID
> >> >>   drm: Enable HDR infoframe support
> >> >>   drm/i915: Attach HDR metadata property to connector
> >> >>   drm/i915: Write HDR infoframe and send to panel
> >> >>   drm/i915:Enabled Modeset when HDR Infoframe changes
> >> >>   drm/i915: Added DRM Infoframe handling for BYT/CHT
> >> >>   video/hdmi: Add Unpack function for DRM infoframe
> >> >>   drm/i915: Add state readout for DRM infoframe
> >> >>
> >> >> Ville Syrjälä (2):
> >> >>   drm: Add HLG EOTF
> >> >>   drm/i915: Enable infoframes on GLK+ for HDR
> >> >>
> >> >>  drivers/gpu/drm/drm_atomic_state_helper.c |   5 +
> >> >>  drivers/gpu/drm/drm_atomic_uapi.c         |  12 ++
> >> >>  drivers/gpu/drm/drm_connector.c           |   6 +
> >> >>  drivers/gpu/drm/drm_edid.c                | 124 ++++++++++++++
> >> >>  drivers/gpu/drm/i915/i915_reg.h           |   4 +
> >> >>  drivers/gpu/drm/i915/intel_atomic.c       |  14 +-
> >> >>  drivers/gpu/drm/i915/intel_ddi.c          |   3 +
> >> >>  drivers/gpu/drm/i915/intel_display.c      |   1 +
> >> >>  drivers/gpu/drm/i915/intel_drv.h          |   1 +
> >> >>  drivers/gpu/drm/i915/intel_hdmi.c         |  67 +++++++-
> >> >>  drivers/video/hdmi.c                      | 257 ++++++++++++++++++++++++++++++
> >> >>  include/drm/drm_connector.h               |  10 ++
> >> >>  include/drm/drm_edid.h                    |   5 +
> >> >>  include/drm/drm_mode_config.h             |   7 +
> >> >>  include/linux/hdmi.h                      |  55 +++++++
> >> >>  include/uapi/drm/drm_mode.h               |  23 +++
> >> >>  16 files changed, 589 insertions(+), 5 deletions(-)
> >> >>
> >> >> --
> >> >> 1.9.1
> >> >>
> >> >> _______________________________________________
> >> >> Intel-gfx mailing list
> >> >> Intel-gfx@lists.freedesktop.org
> >> >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> >> >
> >> >
> >> >
> >> >--
> >> >Daniel Vetter
> >> >Software Engineer, Intel Corporation
> >> >+41 (0) 79 365 57 48 - http://blog.ffwll.ch
> >
> >
> >
> >--
> >Daniel Vetter
> >Software Engineer, Intel Corporation
> >+41 (0) 79 365 57 48 - http://blog.ffwll.ch



--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 40+ messages in thread

* RE: [Intel-gfx] [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer
  2019-05-29 17:35         ` Daniel Vetter
@ 2019-05-29 17:39           ` Shankar, Uma
  0 siblings, 0 replies; 40+ messages in thread
From: Shankar, Uma @ 2019-05-29 17:39 UTC (permalink / raw)
  To: Daniel Vetter; +Cc: Daniele Castagna, jonas, intel-gfx, dri-devel, Sean Paul



>> >-----Original Message-----
>> >From: Daniel Vetter [mailto:daniel@ffwll.ch]
>> >Sent: Wednesday, May 29, 2019 8:33 PM
>> >To: Shankar, Uma <uma.shankar@intel.com>
>> >Cc: intel-gfx <intel-gfx@lists.freedesktop.org>; dri-devel <dri-
>> >devel@lists.freedesktop.org>; Daniele Castagna
>> ><dcastagna@chromium.org>; jonas@kwiboo.se; Sean Paul
>> ><seanpaul@chromium.org>; Sharma, Shashank
>> ><shashank.sharma@intel.com>; Syrjala, Ville
>> ><ville.syrjala@linux.intel.com>
>> >Subject: Re: [Intel-gfx] [v11 00/12] Add HDR Metadata Parsing and
>> >handling in DRM layer
>> >
>> >On Wed, May 29, 2019 at 3:59 PM Shankar, Uma <uma.shankar@intel.com>
>wrote:
>> >>
>> >>
>> >>
>> >> >-----Original Message-----
>> >> >From: Daniel Vetter [mailto:daniel@ffwll.ch]
>> >> >Sent: Wednesday, May 29, 2019 3:13 PM
>> >> >To: Shankar, Uma <uma.shankar@intel.com>
>> >> >Cc: intel-gfx <intel-gfx@lists.freedesktop.org>; dri-devel <dri-
>> >> >devel@lists.freedesktop.org>; Daniele Castagna
>> >> ><dcastagna@chromium.org>; jonas@kwiboo.se; Sean Paul
>> >> ><seanpaul@chromium.org>; Sharma, Shashank
>> >> ><shashank.sharma@intel.com>; Syrjala, Ville
>> >> ><ville.syrjala@linux.intel.com>
>> >> >Subject: Re: [Intel-gfx] [v11 00/12] Add HDR Metadata Parsing and
>> >> >handling in DRM layer
>> >> >
>> >> >When building the docs with make htmldocs:
>> >> >
>> >> >./include/drm/drm_mode_config.h:841: warning: Incorrect use of
>> >> >kernel-doc format:          * hdr_output_metadata_property: Connector
>> >> >property containing hdr
>> >> >./include/drm/drm_mode_config.h:918: warning: Function parameter
>> >> >or member 'hdr_output_metadata_property' not described in
>'drm_mode_config'
>> >> >./include/drm/drm_connector.h:1251: warning: Function parameter or
>> >> >member 'hdr_output_metadata' not described in 'drm_connector'
>> >> >./include/drm/drm_connector.h:1251: warning: Function parameter or
>> >> >member 'hdr_sink_metadata' not described in 'drm_connector'
>> >> >
>> >> >Please fix.
>> >>
>> >> Thanks Daniel, I missed to check the docs warnings. Will fix this.
>> >>
>> >> >In general documentation for this patch seems to be extremely lacking.
>> >> >No property spec, not docs for most of the new stuff added, no nothing.
>> >>
>> >> Will add the property description in connector create properties as well.
>> >>
>> >> >Please fix asap.
>> >>
>> >> Yeah, will send out the doc fix patch soon.
>> >
>> >btw I think the hdmi infoframe helper docs also need more polish.
>> >Generally we only document the driver interface, formal kerneldoc
>> >comments for static functions is overkill. I think you added some of those.
>>
>> Hi Daniel,
>> I tried to stay consistent with how the existing stuff was handled
>> here. So yes, it got added as part of this as well. May be I will drop
>> it for HDR stuff without disturbing the legacy stuff. Hope this is fine ?
>
>There's just one patch before yours that adds kerneldoc to static inline:
>
>commit 2c676f378edb16cb68f7815581c8119fc43a4b85
>Author: Martin Bugge <marbugge@cisco.com>
>Date:   Fri Dec 19 09:14:21 2014 -0300
>
>    [media] hdmi: added unpack and logging functions for InfoFrames
>
>That one didn't go through dri-devel I think. None of the other static functions are
>documented.
>
>I think a patch to remove those (and maybe just have simple comments, but doesn't
>look like anything fancy that's not already obvious) makes sense here.

Sure Daniel, I will create a patch to remove those and then drop the documentation
from the static functions from this file.

>I'm also working on some patches to document drm subsystem documentation rules
>better going forward.

Yeah, this will help have some standardization. Thanks.

Regards,
Uma Shankar

>-Daniel
>
>>
>> Regards,
>> Uma Shankar
>>
>> >If you feel like a comment is needed, sure do that, but just a plain
>> >comment. Always worth it to make sure that the documentation you're
>> >typing actually shows up in the output, and correctly. If it doesn't, then there's
>something to improve.
>> >
>> >Can you pls also take a look at that?
>> >
>> >Thanks, Daniel
>> >>
>> >> Regards,
>> >> Uma Shankar
>> >>
>> >> >Shashank, Ville, this is stuff reviewers must catch.
>> >> >
>> >> >Thanks, Daniel
>> >> >
>> >> >On Thu, May 16, 2019 at 3:43 PM Uma Shankar <uma.shankar@intel.com>
>wrote:
>> >> >>
>> >> >> This patch series enables HDR support in drm. It basically
>> >> >> defines HDR metadata structures, property to pass content (after
>> >> >> blending) metadata from user space compositors to driver.
>> >> >>
>> >> >> Dynamic Range and Mastering infoframe creation and sending.
>> >> >>
>> >> >> ToDo:
>> >> >> 1. We need to get the color framework in place for all planes
>> >> >>    which support HDR content in hardware. This is already in progres
>> >> >>    and patches are out for review in mailing list.
>> >> >> 2. UserSpace/Compositors: Blending policies and metadata blob
>> >> >>    creation and passing to driver. Work is already in progress
>> >> >>    by Intel's middleware teams on wayland and the patches for
>> >> >>    the same are in review.
>> >> >>
>> >> >> A POC has already been developed by Ville based on wayland.
>> >> >> Please refer below link to see the component interactions and usage:
>> >> >> https://lists.freedesktop.org/archives/wayland-devel/2017-Decemb
>> >> >> er/
>> >> >> 036
>> >> >> 403.html
>> >> >>
>> >> >> v2: Updated Ville's POC changes to the patch series.Incorporated
>> >> >> cleanups and fixes from Ville. Rebase on latest drm-tip.
>> >> >>
>> >> >> v3: Fixed a warning causing builds to break on CI. No major change.
>> >> >>
>> >> >> v4: Addressed Shashank's review comments.
>> >> >>
>> >> >> v5: Rebase on top of Ville's infoframe refactoring changes.
>> >> >> Fixed non modeset case for HDR metadata update. Dropped a redundant
>patch.
>> >> >>
>> >> >> v6: Addressed Shashank's review comments and added RB's received.
>> >> >>
>> >> >> v7: Squashed 2 patches, dropped 1 change and addressed Brian
>> >> >> Starkey's and Shashank's review comments.
>> >> >>
>> >> >> v8: Addressed Jonas Karlman review comments. Added Shashank's RB
>> >> >> to the series, fixed a WARN_ON on BYT/CHT.
>> >> >>
>> >> >> v9: Addressed Ville and Jonas Karlman's review comments. Added
>> >> >> the infoframe state readout and metadata reference count.
>> >> >>
>> >> >> v10: Addressed review comments from Jonas and Ville. Dropped one
>> >> >> patch related to i915 fastset handling as per Ville's feedback.
>> >> >>
>> >> >> v11: Addressed Ville's review comments.
>> >> >>
>> >> >> Note: v9 version is already tested with Kodi and a confirmation
>> >> >> from team kodi has been received. Branch details for the same as below:
>> >> >> https://github.com/xbmc/xbmc/tree/feature_drmprime-vaapi
>> >> >>
>> >> >> v9 of this series is:
>> >> >> Tested-by: Jonas Karlman <jonas@kwiboo.se>
>> >> >>
>> >> >> Jonas Karlman (1):
>> >> >>   drm: Add reference counting on HDR metadata blob
>> >> >>
>> >> >> Uma Shankar (9):
>> >> >>   drm: Add HDR source metadata property
>> >> >>   drm: Parse HDR metadata info from EDID
>> >> >>   drm: Enable HDR infoframe support
>> >> >>   drm/i915: Attach HDR metadata property to connector
>> >> >>   drm/i915: Write HDR infoframe and send to panel
>> >> >>   drm/i915:Enabled Modeset when HDR Infoframe changes
>> >> >>   drm/i915: Added DRM Infoframe handling for BYT/CHT
>> >> >>   video/hdmi: Add Unpack function for DRM infoframe
>> >> >>   drm/i915: Add state readout for DRM infoframe
>> >> >>
>> >> >> Ville Syrjälä (2):
>> >> >>   drm: Add HLG EOTF
>> >> >>   drm/i915: Enable infoframes on GLK+ for HDR
>> >> >>
>> >> >>  drivers/gpu/drm/drm_atomic_state_helper.c |   5 +
>> >> >>  drivers/gpu/drm/drm_atomic_uapi.c         |  12 ++
>> >> >>  drivers/gpu/drm/drm_connector.c           |   6 +
>> >> >>  drivers/gpu/drm/drm_edid.c                | 124 ++++++++++++++
>> >> >>  drivers/gpu/drm/i915/i915_reg.h           |   4 +
>> >> >>  drivers/gpu/drm/i915/intel_atomic.c       |  14 +-
>> >> >>  drivers/gpu/drm/i915/intel_ddi.c          |   3 +
>> >> >>  drivers/gpu/drm/i915/intel_display.c      |   1 +
>> >> >>  drivers/gpu/drm/i915/intel_drv.h          |   1 +
>> >> >>  drivers/gpu/drm/i915/intel_hdmi.c         |  67 +++++++-
>> >> >>  drivers/video/hdmi.c                      | 257 ++++++++++++++++++++++++++++++
>> >> >>  include/drm/drm_connector.h               |  10 ++
>> >> >>  include/drm/drm_edid.h                    |   5 +
>> >> >>  include/drm/drm_mode_config.h             |   7 +
>> >> >>  include/linux/hdmi.h                      |  55 +++++++
>> >> >>  include/uapi/drm/drm_mode.h               |  23 +++
>> >> >>  16 files changed, 589 insertions(+), 5 deletions(-)
>> >> >>
>> >> >> --
>> >> >> 1.9.1
>> >> >>
>> >> >> _______________________________________________
>> >> >> Intel-gfx mailing list
>> >> >> Intel-gfx@lists.freedesktop.org
>> >> >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>> >> >
>> >> >
>> >> >
>> >> >--
>> >> >Daniel Vetter
>> >> >Software Engineer, Intel Corporation
>> >> >+41 (0) 79 365 57 48 - http://blog.ffwll.ch
>> >
>> >
>> >
>> >--
>> >Daniel Vetter
>> >Software Engineer, Intel Corporation
>> >+41 (0) 79 365 57 48 - http://blog.ffwll.ch
>
>
>
>--
>Daniel Vetter
>Software Engineer, Intel Corporation
>+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 40+ messages in thread

end of thread, other threads:[~2019-05-29 17:39 UTC | newest]

Thread overview: 40+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-16 14:10 [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
2019-05-16 14:10 ` [v11 01/12] drm: Add HDR source metadata property Uma Shankar
2019-05-16 14:10 ` [v11 02/12] drm: Add reference counting on HDR metadata blob Uma Shankar
2019-05-16 14:10 ` [v11 03/12] drm: Parse HDR metadata info from EDID Uma Shankar
2019-05-16 14:10 ` [v11 04/12] drm: Enable HDR infoframe support Uma Shankar
2019-05-16 14:10 ` [v11 05/12] drm/i915: Attach HDR metadata property to connector Uma Shankar
2019-05-17 14:06   ` Ville Syrjälä
2019-05-17 16:19     ` [v12 " Uma Shankar
2019-05-16 14:10 ` [v11 06/12] drm/i915: Write HDR infoframe and send to panel Uma Shankar
2019-05-17 14:06   ` Ville Syrjälä
2019-05-17 16:20     ` [v12 " Uma Shankar
2019-05-18 10:39       ` [v13 " Uma Shankar
2019-05-16 14:10 ` [v11 07/12] drm: Add HLG EOTF Uma Shankar
2019-05-16 14:10 ` [v11 08/12] drm/i915: Enable infoframes on GLK+ for HDR Uma Shankar
2019-05-17 14:01   ` Ville Syrjälä
2019-05-17 16:22     ` [v12 " Uma Shankar
2019-05-16 14:10 ` [v11 09/12] drm/i915:Enabled Modeset when HDR Infoframe changes Uma Shankar
2019-05-16 14:10 ` [v11 10/12] drm/i915: Added DRM Infoframe handling for BYT/CHT Uma Shankar
2019-05-16 14:10 ` [v11 11/12] video/hdmi: Add Unpack function for DRM infoframe Uma Shankar
2019-05-16 14:10 ` [v11 12/12] drm/i915: Add state readout " Uma Shankar
2019-05-16 14:12 ` ✗ Fi.CI.CHECKPATCH: warning for Add HDR Metadata Parsing and handling in DRM layer (rev11) Patchwork
2019-05-16 14:37 ` ✓ Fi.CI.BAT: success " Patchwork
2019-05-16 19:35 ` ✓ Fi.CI.IGT: " Patchwork
2019-05-17 16:07 ` ✗ Fi.CI.CHECKPATCH: warning for Add HDR Metadata Parsing and handling in DRM layer (rev14) Patchwork
2019-05-17 16:34 ` ✓ Fi.CI.BAT: success " Patchwork
2019-05-18  3:18 ` ✗ Fi.CI.IGT: failure " Patchwork
2019-05-18 10:27 ` ✗ Fi.CI.CHECKPATCH: warning for Add HDR Metadata Parsing and handling in DRM layer (rev15) Patchwork
2019-05-18 10:47 ` ✓ Fi.CI.BAT: success " Patchwork
2019-05-18 15:47 ` ✓ Fi.CI.IGT: " Patchwork
2019-05-22 20:45 ` [v11 00/12] Add HDR Metadata Parsing and handling in DRM layer Ville Syrjälä
2019-05-23  8:09   ` Jani Nikula
2019-05-23  8:41     ` [Intel-gfx] " Daniel Vetter
2019-05-28 11:35   ` Maarten Lankhorst
2019-05-28 11:43     ` Shankar, Uma
2019-05-29  9:43 ` Daniel Vetter
2019-05-29 13:58   ` Shankar, Uma
2019-05-29 15:03     ` [Intel-gfx] " Daniel Vetter
2019-05-29 17:28       ` Shankar, Uma
2019-05-29 17:35         ` Daniel Vetter
2019-05-29 17:39           ` [Intel-gfx] " Shankar, Uma

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.