* [v3 00/14] Add HDR Metadata Parsing and handling in DRM layer
@ 2018-12-11 22:35 Uma Shankar
2018-12-11 22:35 ` [v3 01/14] drm: Add HDR source metadata property Uma Shankar
` (16 more replies)
0 siblings, 17 replies; 18+ messages in thread
From: Uma Shankar @ 2018-12-11 22:35 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: ville.syrjala, maarten.lankhorst
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 we should be getting
the initial version pretty soon for review.
Please review and share your feedbacks/suggestions.
Note: The intention for these patches is to get a design feedback on
the uapi changes, generic property design and infoframe handling.
This cannot get merged as of now without the userspace support in place.
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.
Note: It took a while to float this version as there was no userspace
consumer for it and dependency on full userspace stack. However, things
are falling in place now. Media driver and VAAPI changes for HDR are
already out, with compositors changes also expected to land soon.
Uma Shankar (10):
drm: Add HDR source metadata property
drm: Add CEA extended tag blocks and HDR bitfield macros
drm: Parse HDR metadata info from EDID
drm: Parse Colorimetry data block from EDID
drm/i915: Attach HDR metadata property to connector
drm: Add HDR capability field to plane structure
drm: Implement HDR source metadata set and get property handling
drm: Enable HDR infoframe support
drm/i915: Write HDR infoframe and send to panel
drm/i915:Enabled Modeset when HDR Infoframe changes
Ville Syrjälä (4):
drm/i915: [DO NOT MERGE] hack for glk board outputs
drm/i915: Add HLG EOTF
drm/i915: Enable infoframes on GLK+ for HDR
drivers/video: Constantify function argument for HDMI infoframe log
drivers/gpu/drm/drm_atomic.c | 2 +
drivers/gpu/drm/drm_atomic_uapi.c | 13 ++++
drivers/gpu/drm/drm_connector.c | 6 ++
drivers/gpu/drm/drm_edid.c | 143 ++++++++++++++++++++++++++++++++++++
drivers/gpu/drm/i915/i915_reg.h | 4 +
drivers/gpu/drm/i915/intel_atomic.c | 15 +++-
drivers/gpu/drm/i915/intel_bios.c | 7 ++
drivers/gpu/drm/i915/intel_hdmi.c | 43 ++++++++++-
drivers/video/hdmi.c | 129 ++++++++++++++++++++++++++++++++
include/drm/drm_connector.h | 12 +++
include/drm/drm_edid.h | 4 +
include/drm/drm_mode_config.h | 6 ++
include/drm/drm_plane.h | 3 +
include/linux/hdmi.h | 33 +++++++++
include/uapi/drm/drm_mode.h | 16 ++++
15 files changed, 433 insertions(+), 3 deletions(-)
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 18+ messages in thread
* [v3 01/14] drm: Add HDR source metadata property
2018-12-11 22:35 [v3 00/14] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
@ 2018-12-11 22:35 ` Uma Shankar
2018-12-11 22:35 ` [v3 02/14] drm: Add CEA extended tag blocks and HDR bitfield macros Uma Shankar
` (15 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Uma Shankar @ 2018-12-11 22:35 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: Uma Shankar, ville.syrjala, maarten.lankhorst
This patch adds a blob property to get HDR metadata
information from userspace. This will be send as part
of AVI Infoframe to panel.
v2: Rebase and modified the metadata structure elements
as per Ville's POC changes.
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
---
drivers/gpu/drm/drm_connector.c | 6 ++++++
include/drm/drm_connector.h | 10 ++++++++++
include/drm/drm_mode_config.h | 6 ++++++
include/linux/hdmi.h | 10 ++++++++++
include/uapi/drm/drm_mode.h | 16 ++++++++++++++++
5 files changed, 48 insertions(+)
diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
index da8ae80..361fcda 100644
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
@@ -1027,6 +1027,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_SOURCE_METADATA", 0);
+ if (!prop)
+ return -ENOMEM;
+ dev->mode_config.hdr_source_metadata_property = prop;
+
return 0;
}
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index 9be2181..2ee45dc 100644
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
@@ -520,6 +520,13 @@ struct drm_connector_state {
* and the connector bpc limitations obtained from edid.
*/
u8 max_bpc;
+
+ /**
+ * @metadata_blob_ptr:
+ * DRM blob property for HDR metadata
+ */
+ struct drm_property_blob *hdr_source_metadata_blob_ptr;
+ u8 hdr_metadata_changed : 1;
};
/**
@@ -1154,6 +1161,9 @@ struct drm_connector {
* &drm_mode_config.connector_free_work.
*/
struct llist_node free_node;
+
+ /* HDR metdata */
+ struct hdr_static_metadata hdr_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 69ccd27..4b3211b 100644
--- a/include/drm/drm_mode_config.h
+++ b/include/drm/drm_mode_config.h
@@ -836,6 +836,12 @@ struct drm_mode_config {
*/
struct drm_property *writeback_out_fence_ptr_property;
+ /*
+ * hdr_metadata_property: Connector property containing hdr metatda
+ * This will be provided by userspace compositors based on HDR content
+ */
+ struct drm_property *hdr_source_metadata_property;
+
/* dumb ioctl parameters */
uint32_t preferred_depth, prefer_shadow;
diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h
index d2bacf5..bed3e08 100644
--- a/include/linux/hdmi.h
+++ b/include/linux/hdmi.h
@@ -137,6 +137,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;
diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h
index a439c2e..5012af2 100644
--- a/include/uapi/drm/drm_mode.h
+++ b/include/uapi/drm/drm_mode.h
@@ -630,6 +630,22 @@ struct drm_color_lut {
__u16 reserved;
};
+/* HDR Metadata */
+struct hdr_static_metadata {
+ uint8_t eotf;
+ uint8_t metadata_type;
+ struct {
+ uint16_t x, y;
+ } display_primaries[3];
+ struct {
+ uint16_t x, y;
+ } white_point;
+ uint16_t max_mastering_display_luminance;
+ uint16_t min_mastering_display_luminance;
+ uint16_t max_fall;
+ uint16_t max_cll;
+};
+
#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] 18+ messages in thread
* [v3 02/14] drm: Add CEA extended tag blocks and HDR bitfield macros
2018-12-11 22:35 [v3 00/14] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
2018-12-11 22:35 ` [v3 01/14] drm: Add HDR source metadata property Uma Shankar
@ 2018-12-11 22:35 ` Uma Shankar
2018-12-11 22:35 ` [v3 03/14] drm: Parse HDR metadata info from EDID Uma Shankar
` (14 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Uma Shankar @ 2018-12-11 22:35 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: ville.syrjala, maarten.lankhorst
Add bit field and macro for extended tag in CEA block. Also,
declare macros for HDR metadata block.
v2: Rebase
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
---
drivers/gpu/drm/drm_edid.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index b506e36..106fd38 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -2843,6 +2843,22 @@ static int drm_cvt_modes(struct drm_connector *connector,
#define EDID_CEA_YCRCB422 (1 << 4)
#define EDID_CEA_VCDB_QS (1 << 6)
+#define DATA_BLOCK_EXTENDED_TAG 0x07
+#define VIDEO_CAPABILITY_DATA_BLOCK 0x0
+#define VSVD_DATA_BLOCK 0x1
+#define COLORIMETRY_DATA_BLOCK 0x5
+#define HDR_STATIC_METADATA_BLOCK 0x6
+
+/* HDR Metadata Block: Bit fields */
+#define SUPPORTED_EOTF_MASK 0x3f
+#define TRADITIONAL_GAMMA_SDR (0x1 << 0)
+#define TRADITIONAL_GAMMA_HDR (0x1 << 1)
+#define SMPTE_ST2084 (0x1 << 2)
+#define FUTURE_EOTF (0x1 << 3)
+#define RESERVED_EOTF (0x3 << 4)
+
+#define STATIC_METADATA_TYPE1 (0x1 << 0)
+
/*
* Search EDID for CEA extension block.
*/
--
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] 18+ messages in thread
* [v3 03/14] drm: Parse HDR metadata info from EDID
2018-12-11 22:35 [v3 00/14] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
2018-12-11 22:35 ` [v3 01/14] drm: Add HDR source metadata property Uma Shankar
2018-12-11 22:35 ` [v3 02/14] drm: Add CEA extended tag blocks and HDR bitfield macros Uma Shankar
@ 2018-12-11 22:35 ` Uma Shankar
2018-12-11 22:35 ` [v3 04/14] drm: Parse Colorimetry data block " Uma Shankar
` (13 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Uma Shankar @ 2018-12-11 22:35 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: ville.syrjala, maarten.lankhorst
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.
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
---
drivers/gpu/drm/drm_edid.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 106fd38..d12b74e 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -3818,6 +3818,49 @@ 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) != DATA_BLOCK_EXTENDED_TAG)
+ return false;
+
+ if (db[1] != HDR_STATIC_METADATA_BLOCK)
+ return false;
+
+ return true;
+}
+
+static uint16_t eotf_supported(const u8 *edid_ext)
+{
+
+ return edid_ext[2] &
+ (BIT(HDMI_EOTF_TRADITIONAL_GAMMA_SDR) |
+ BIT(HDMI_EOTF_TRADITIONAL_GAMMA_HDR) |
+ BIT(HDMI_EOTF_SMPTE_ST2084));
+
+}
+
+static uint16_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)
+{
+ uint16_t len;
+
+ len = cea_db_payload_len(db);
+ connector->hdr_metadata.eotf = eotf_supported(db);
+ connector->hdr_metadata.metadata_type = hdr_metadata_type(db);
+
+ if (len >= 5)
+ connector->hdr_metadata.max_fall = db[5];
+ if (len >= 4)
+ connector->hdr_metadata.max_cll = db[4];
+}
+
static void
drm_parse_hdmi_vsdb_audio(struct drm_connector *connector, const u8 *db)
{
@@ -4468,6 +4511,8 @@ static void drm_parse_cea_ext(struct drm_connector *connector,
drm_parse_hdmi_forum_vsdb(connector, db);
if (cea_db_is_y420cmdb(db))
drm_parse_y420cmdb_bitmap(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] 18+ messages in thread
* [v3 04/14] drm: Parse Colorimetry data block from EDID
2018-12-11 22:35 [v3 00/14] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
` (2 preceding siblings ...)
2018-12-11 22:35 ` [v3 03/14] drm: Parse HDR metadata info from EDID Uma Shankar
@ 2018-12-11 22:35 ` Uma Shankar
2018-12-11 22:35 ` [v3 05/14] drm/i915: Attach HDR metadata property to connector Uma Shankar
` (12 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Uma Shankar @ 2018-12-11 22:35 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: ville.syrjala, maarten.lankhorst
CEA 861.3 spec adds colorimetry data block for HDMI.
Parsing the block to get the colorimetry data from
panel.
v2: Rebase
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
---
drivers/gpu/drm/drm_edid.c | 24 ++++++++++++++++++++++++
include/drm/drm_connector.h | 2 ++
2 files changed, 26 insertions(+)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index d12b74e..344d8c1 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -3818,6 +3818,28 @@ static void fixup_detailed_cea_mode_clock(struct drm_display_mode *mode)
mode->clock = clock;
}
+static bool cea_db_is_hdmi_colorimetry_data_block(const u8 *db)
+{
+ if (cea_db_tag(db) != DATA_BLOCK_EXTENDED_TAG)
+ return false;
+
+ if (db[1] != COLORIMETRY_DATA_BLOCK)
+ return false;
+
+ return true;
+}
+
+static void
+drm_parse_colorimetry_data_block(struct drm_connector *connector, const u8 *db)
+{
+ struct drm_hdmi_info *info = &connector->display_info.hdmi;
+ uint16_t len;
+
+ len = cea_db_payload_len(db);
+ info->colorimetry = db[2];
+}
+
+
static bool cea_db_is_hdmi_hdr_metadata_block(const u8 *db)
{
if (cea_db_tag(db) != DATA_BLOCK_EXTENDED_TAG)
@@ -4513,6 +4535,8 @@ static void drm_parse_cea_ext(struct drm_connector *connector,
drm_parse_y420cmdb_bitmap(connector, db);
if (cea_db_is_hdmi_hdr_metadata_block(db))
drm_parse_hdr_metadata_block(connector, db);
+ if (cea_db_is_hdmi_colorimetry_data_block(db))
+ drm_parse_colorimetry_data_block(connector, db);
}
}
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index 2ee45dc..90ce364 100644
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
@@ -206,6 +206,8 @@ struct drm_hdmi_info {
/** @y420_dc_modes: bitmap of deep color support index */
u8 y420_dc_modes;
+
+ u8 colorimetry;
};
/**
--
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] 18+ messages in thread
* [v3 05/14] drm/i915: Attach HDR metadata property to connector
2018-12-11 22:35 [v3 00/14] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
` (3 preceding siblings ...)
2018-12-11 22:35 ` [v3 04/14] drm: Parse Colorimetry data block " Uma Shankar
@ 2018-12-11 22:35 ` Uma Shankar
2018-12-11 22:35 ` [v3 06/14] drm: Add HDR capability field to plane structure Uma Shankar
` (11 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Uma Shankar @ 2018-12-11 22:35 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: ville.syrjala, maarten.lankhorst
Attach HDR metadata property to connector object.
v2: Rebase
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 07e803a..8a1e5cb 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -2154,6 +2154,8 @@ static void intel_hdmi_destroy(struct drm_connector *connector)
intel_attach_aspect_ratio_property(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_source_metadata_property, 0);
if (!HAS_GMCH_DISPLAY(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] 18+ messages in thread
* [v3 06/14] drm: Add HDR capability field to plane structure
2018-12-11 22:35 [v3 00/14] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
` (4 preceding siblings ...)
2018-12-11 22:35 ` [v3 05/14] drm/i915: Attach HDR metadata property to connector Uma Shankar
@ 2018-12-11 22:35 ` Uma Shankar
2018-12-11 22:35 ` [v3 07/14] drm: Implement HDR source metadata set and get property handling Uma Shankar
` (10 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Uma Shankar @ 2018-12-11 22:35 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: ville.syrjala, maarten.lankhorst
Hardware may have HDR capability on certain plane
engines. Enabling the same in drm plane structure
so that this can be communicated to user space.
Each drm driver should set this flag to true for planes
which support HDR.
v2: Rebase
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
---
include/drm/drm_plane.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h
index 6078c70..206eefc 100644
--- a/include/drm/drm_plane.h
+++ b/include/drm/drm_plane.h
@@ -638,6 +638,9 @@ struct drm_plane {
/** @type: Type of plane, see &enum drm_plane_type for details. */
enum drm_plane_type type;
+ /* Value of true:1 means HDR is supported */
+ bool hdr_supported;
+
/**
* @index: Position inside the mode_config.list, can be used as an array
* index. It is invariant over the lifetime of the plane.
--
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] 18+ messages in thread
* [v3 07/14] drm: Implement HDR source metadata set and get property handling
2018-12-11 22:35 [v3 00/14] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
` (5 preceding siblings ...)
2018-12-11 22:35 ` [v3 06/14] drm: Add HDR capability field to plane structure Uma Shankar
@ 2018-12-11 22:35 ` Uma Shankar
2018-12-11 22:35 ` [v3 08/14] drm: Enable HDR infoframe support Uma Shankar
` (9 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Uma Shankar @ 2018-12-11 22:35 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: Uma Shankar, ville.syrjala, maarten.lankhorst
HDR source metadata set and get property implemented in this
patch. 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 added Ville's POC changes
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
---
drivers/gpu/drm/drm_atomic.c | 2 ++
drivers/gpu/drm/drm_atomic_uapi.c | 13 +++++++++++++
2 files changed, 15 insertions(+)
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 5eb4013..4e71c6b 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -881,6 +881,8 @@ static void drm_atomic_connector_print_state(struct drm_printer *p,
drm_printf(p, "connector[%u]: %s\n", connector->base.id, connector->name);
drm_printf(p, "\tcrtc=%s\n", state->crtc ? state->crtc->name : "(null)");
+ drm_printf(p, "\thdr_metadata_changed=%d\n",
+ state->hdr_metadata_changed);
if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK)
if (state->writeback_job && state->writeback_job->fb)
diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c
index c408898..b721b12 100644
--- a/drivers/gpu/drm/drm_atomic_uapi.c
+++ b/drivers/gpu/drm/drm_atomic_uapi.c
@@ -686,6 +686,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, NULL, val);
@@ -734,6 +736,14 @@ 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_source_metadata_property) {
+ ret = drm_atomic_replace_property_blob_from_id(dev,
+ &state->hdr_source_metadata_blob_ptr,
+ val,
+ -1, sizeof(struct hdr_static_metadata),
+ &replaced);
+ state->hdr_metadata_changed |= replaced;
+ return ret;
} else if (property == config->aspect_ratio_property) {
state->picture_aspect_ratio = val;
} else if (property == config->content_type_property) {
@@ -816,6 +826,9 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector,
*val = state->content_type;
} else if (property == connector->scaling_mode_property) {
*val = state->scaling_mode;
+ } else if (property == config->hdr_source_metadata_property) {
+ *val = (state->hdr_source_metadata_blob_ptr) ?
+ state->hdr_source_metadata_blob_ptr->base.id : 0;
} else if (property == connector->content_protection_property) {
*val = state->content_protection;
} else if (property == config->writeback_fb_id_property) {
--
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] 18+ messages in thread
* [v3 08/14] drm: Enable HDR infoframe support
2018-12-11 22:35 [v3 00/14] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
` (6 preceding siblings ...)
2018-12-11 22:35 ` [v3 07/14] drm: Implement HDR source metadata set and get property handling Uma Shankar
@ 2018-12-11 22:35 ` Uma Shankar
2018-12-11 22:35 ` [v3 09/14] drm/i915: Write HDR infoframe and send to panel Uma Shankar
` (8 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Uma Shankar @ 2018-12-11 22:35 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: ville.syrjala, maarten.lankhorst
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.
v2: Rebase and added Ville's POC changes.
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
---
drivers/gpu/drm/drm_edid.c | 58 ++++++++++++++++++++
drivers/video/hdmi.c | 129 +++++++++++++++++++++++++++++++++++++++++++++
include/drm/drm_edid.h | 4 ++
include/linux/hdmi.h | 22 ++++++++
4 files changed, 213 insertions(+)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 344d8c1..5a7fc9b 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -4916,6 +4916,64 @@ void drm_set_preferred_mode(struct drm_connector *connector,
EXPORT_SYMBOL(drm_set_preferred_mode);
/**
+ * drm_hdmi_infoframe_set_hdr_metadata() - fill an HDMI AVI infoframe with
+ * HDR metadata from userspace
+ * @frame: HDMI AVI infoframe
+ * @hdr_source_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,
+ void *hdr_metadata)
+{
+ struct hdr_static_metadata *hdr_source_metadata;
+ int err, i;
+
+ if (!frame || !hdr_metadata)
+ return -EINVAL;
+
+ err = hdmi_drm_infoframe_init(frame);
+ if (err < 0)
+ return err;
+
+ DRM_DEBUG_KMS("type = %x\n", frame->type);
+
+ hdr_source_metadata = (struct hdr_static_metadata *)hdr_metadata;
+
+ frame->length = sizeof(struct hdr_static_metadata);
+
+
+ frame->eotf = hdr_source_metadata->eotf;
+ frame->metadata_type = hdr_source_metadata->metadata_type;
+
+ for (i = 0; i < 3; i++) {
+ frame->display_primaries[i].x =
+ hdr_source_metadata->display_primaries[i].x;
+ frame->display_primaries[i].y =
+ hdr_source_metadata->display_primaries[i].y;
+ }
+
+ frame->white_point.x = hdr_source_metadata->white_point.x;
+ frame->white_point.y = hdr_source_metadata->white_point.y;
+
+ frame->max_mastering_display_luminance =
+ hdr_source_metadata->max_mastering_display_luminance;
+ frame->min_mastering_display_luminance =
+ hdr_source_metadata->min_mastering_display_luminance;
+
+ frame->max_cll = hdr_source_metadata->max_cll;
+ frame->max_fall = hdr_source_metadata->max_fall;
+
+ hdmi_infoframe_log(KERN_CRIT, NULL,
+ (union hdmi_infoframe *)frame);
+
+ 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
* @frame: HDMI AVI infoframe
diff --git a/drivers/video/hdmi.c b/drivers/video/hdmi.c
index 799ae49..0937c8c 100644
--- a/drivers/video/hdmi.c
+++ b/drivers/video/hdmi.c
@@ -650,6 +650,93 @@ 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;
+
+ return 0;
+}
+EXPORT_SYMBOL(hdmi_drm_infoframe_init);
+
+/**
+ * hdmi_drm_infoframe_pack() - 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(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 & 0xff;
+ *ptr++ = frame->display_primaries[i].x >> 8;
+ *ptr++ = frame->display_primaries[i].y & 0xff;
+ *ptr++ = frame->display_primaries[i].y >> 8;
+ }
+
+ *ptr++ = frame->white_point.x & 0xff;
+ *ptr++ = frame->white_point.x >> 8;
+
+ *ptr++ = frame->white_point.y & 0xff;
+ *ptr++ = frame->white_point.y >> 8;
+
+ *ptr++ = frame->max_mastering_display_luminance & 0xff;
+ *ptr++ = frame->max_mastering_display_luminance >> 8;
+
+ *ptr++ = frame->min_mastering_display_luminance & 0xff;
+ *ptr++ = frame->min_mastering_display_luminance >> 8;
+
+ *ptr++ = frame->max_cll & 0xff;
+ *ptr++ = frame->max_cll >> 8;
+
+ *ptr++ = frame->max_fall & 0xff;
+ *ptr++ = frame->max_fall >> 8;
+
+ hdmi_infoframe_set_checksum(buffer, length);
+
+ return length;
+}
+
/*
* hdmi_vendor_any_infoframe_check() - check a vendor infoframe
*/
@@ -806,6 +893,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 +928,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 +1376,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,
+ 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_mastering_display_luminance: %d\n",
+ frame->max_mastering_display_luminance);
+ hdmi_log("min_mastering_display_luminance: %d\n",
+ frame->min_mastering_display_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 +1498,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 e3c4048..0511607 100644
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
@@ -365,6 +365,10 @@ int drm_av_sync_delay(struct drm_connector *connector,
bool rgb_quant_range_selectable,
bool is_hdmi2_sink);
+int
+drm_hdmi_infoframe_set_hdr_metadata(struct hdmi_drm_infoframe *frame,
+ void *hdr_source_metadata);
+
/**
* 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 bed3e08..ce00e1e 100644
--- a/include/linux/hdmi.h
+++ b/include/linux/hdmi.h
@@ -32,6 +32,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
@@ -170,12 +171,32 @@ struct hdmi_avi_infoframe {
unsigned short right_bar;
};
+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 {
+ uint16_t x, y;
+ } display_primaries[3];
+ struct {
+ uint16_t x, y;
+ } white_point;
+ uint16_t max_mastering_display_luminance;
+ uint16_t min_mastering_display_luminance;
+ uint16_t max_fall;
+ uint16_t max_cll;
+ uint16_t min_cll;
+};
+
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);
enum hdmi_spd_sdi {
HDMI_SPD_SDI_UNKNOWN,
@@ -350,6 +371,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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [v3 09/14] drm/i915: Write HDR infoframe and send to panel
2018-12-11 22:35 [v3 00/14] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
` (7 preceding siblings ...)
2018-12-11 22:35 ` [v3 08/14] drm: Enable HDR infoframe support Uma Shankar
@ 2018-12-11 22:35 ` Uma Shankar
2018-12-11 22:35 ` [v3 10/14] drm/i915: [DO NOT MERGE] hack for glk board outputs Uma Shankar
` (7 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Uma Shankar @ 2018-12-11 22:35 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: Uma Shankar, ville.syrjala, maarten.lankhorst
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
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
---
drivers/gpu/drm/i915/intel_hdmi.c | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 8a1e5cb..3e7c074 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -475,6 +475,29 @@ static void intel_write_infoframe(struct intel_encoder *encoder,
frame->any.type, buffer, len);
}
+/* Set Dynamic Range and Mastering Infoframe */
+static void intel_hdmi_set_drm_infoframe(struct intel_encoder *encoder,
+ const struct intel_crtc_state
+ *crtc_state,
+ const struct drm_connector_state
+ *conn_state)
+{
+ union hdmi_infoframe frame;
+ struct hdr_static_metadata *hdr_metadata;
+ int ret;
+
+ hdr_metadata = (struct hdr_static_metadata *)
+ conn_state->hdr_source_metadata_blob_ptr->data;
+
+ ret = drm_hdmi_infoframe_set_hdr_metadata(&frame.drm, hdr_metadata);
+ if (ret < 0) {
+ DRM_ERROR("couldn't set HDR metadata in infoframe\n");
+ return;
+ }
+
+ intel_write_infoframe(encoder, crtc_state, &frame);
+}
+
static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder,
const struct intel_crtc_state *crtc_state,
const struct drm_connector_state *conn_state)
@@ -883,6 +906,10 @@ static void hsw_set_infoframes(struct intel_encoder *encoder,
intel_hdmi_set_avi_infoframe(encoder, crtc_state, conn_state);
intel_hdmi_set_spd_infoframe(encoder, crtc_state);
intel_hdmi_set_hdmi_infoframe(encoder, crtc_state, conn_state);
+
+ /* Set Dynamic Range and Mastering Infoframe if supported and changed */
+ if (conn_state->hdr_metadata_changed)
+ intel_hdmi_set_drm_infoframe(encoder, crtc_state, conn_state);
}
void intel_dp_dual_mode_set_tmds_output(struct intel_hdmi *hdmi, bool enable)
--
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] 18+ messages in thread
* [v3 10/14] drm/i915: [DO NOT MERGE] hack for glk board outputs
2018-12-11 22:35 [v3 00/14] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
` (8 preceding siblings ...)
2018-12-11 22:35 ` [v3 09/14] drm/i915: Write HDR infoframe and send to panel Uma Shankar
@ 2018-12-11 22:35 ` Uma Shankar
2018-12-11 22:35 ` [v3 11/14] drm/i915: Add HLG EOTF Uma Shankar
` (6 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Uma Shankar @ 2018-12-11 22:35 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: ville.syrjala, Uma Shankar, maarten.lankhorst
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
This is to limit PORT C on GLK to drive only
HDMI. Not sure if this is mandatory, this is just
to test HDR on GLK HDMI.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
---
drivers/gpu/drm/i915/intel_bios.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index 6d3e026..e1c48ad 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -1381,6 +1381,13 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port,
is_hdmi = false;
}
+ if (IS_GEMINILAKE(dev_priv) && port == PORT_C) {
+ is_hdmi = true;
+ is_dvi = true;
+ is_dp = false;
+ is_edp = false;
+ }
+
info->supports_dvi = is_dvi;
info->supports_hdmi = is_hdmi;
info->supports_dp = is_dp;
--
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] 18+ messages in thread
* [v3 11/14] drm/i915: Add HLG EOTF
2018-12-11 22:35 [v3 00/14] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
` (9 preceding siblings ...)
2018-12-11 22:35 ` [v3 10/14] drm/i915: [DO NOT MERGE] hack for glk board outputs Uma Shankar
@ 2018-12-11 22:35 ` Uma Shankar
2018-12-11 22:35 ` [v3 12/14] drm/i915: Enable infoframes on GLK+ for HDR Uma Shankar
` (5 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Uma Shankar @ 2018-12-11 22:35 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: ville.syrjala, maarten.lankhorst
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
ADD HLG EOTF to the list of EOTF transfer functions
supported.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
---
drivers/gpu/drm/drm_edid.c | 4 ++--
include/linux/hdmi.h | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 5a7fc9b..fa86494 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -3857,8 +3857,8 @@ static uint16_t eotf_supported(const u8 *edid_ext)
return edid_ext[2] &
(BIT(HDMI_EOTF_TRADITIONAL_GAMMA_SDR) |
BIT(HDMI_EOTF_TRADITIONAL_GAMMA_HDR) |
- BIT(HDMI_EOTF_SMPTE_ST2084));
-
+ BIT(HDMI_EOTF_SMPTE_ST2084) |
+ BIT(HDMI_EOTF_BT_2100_HLG));
}
static uint16_t hdr_metadata_type(const u8 *edid_ext)
diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h
index ce00e1e..b5346c3 100644
--- a/include/linux/hdmi.h
+++ b/include/linux/hdmi.h
@@ -146,6 +146,7 @@ enum hdmi_eotf {
HDMI_EOTF_TRADITIONAL_GAMMA_SDR,
HDMI_EOTF_TRADITIONAL_GAMMA_HDR,
HDMI_EOTF_SMPTE_ST2084,
+ HDMI_EOTF_BT_2100_HLG,
};
struct hdmi_avi_infoframe {
--
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] 18+ messages in thread
* [v3 12/14] drm/i915: Enable infoframes on GLK+ for HDR
2018-12-11 22:35 [v3 00/14] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
` (10 preceding siblings ...)
2018-12-11 22:35 ` [v3 11/14] drm/i915: Add HLG EOTF Uma Shankar
@ 2018-12-11 22:35 ` Uma Shankar
2018-12-11 22:35 ` [v3 13/14] drm/i915:Enabled Modeset when HDR Infoframe changes Uma Shankar
` (4 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Uma Shankar @ 2018-12-11 22:35 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: ville.syrjala, Uma Shankar, maarten.lankhorst
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.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
---
drivers/gpu/drm/i915/i915_reg.h | 4 ++++
drivers/gpu/drm/i915/intel_hdmi.c | 12 +++++++++---
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 0a7d605..6f44d02 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -4591,6 +4591,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
@@ -8015,6 +8016,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
@@ -8028,6 +8030,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
@@ -8052,6 +8055,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_GCP(trans) _MMIO_TRANS2(trans, _HSW_VIDEO_DIP_GCP_A)
#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 3e7c074..8d145d4 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -123,6 +123,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;
@@ -146,6 +148,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;
@@ -432,7 +436,8 @@ static bool hsw_infoframe_enabled(struct intel_encoder *encoder,
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);
+ VIDEO_DIP_ENABLE_GMP_HSW | VIDEO_DIP_ENABLE_SPD_HSW |
+ VIDEO_DIP_ENABLE_DRM_GLK);
}
/*
@@ -889,7 +894,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);
@@ -908,7 +914,7 @@ static void hsw_set_infoframes(struct intel_encoder *encoder,
intel_hdmi_set_hdmi_infoframe(encoder, crtc_state, conn_state);
/* Set Dynamic Range and Mastering Infoframe if supported and changed */
- if (conn_state->hdr_metadata_changed)
+ if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
intel_hdmi_set_drm_infoframe(encoder, crtc_state, conn_state);
}
--
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] 18+ messages in thread
* [v3 13/14] drm/i915:Enabled Modeset when HDR Infoframe changes
2018-12-11 22:35 [v3 00/14] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
` (11 preceding siblings ...)
2018-12-11 22:35 ` [v3 12/14] drm/i915: Enable infoframes on GLK+ for HDR Uma Shankar
@ 2018-12-11 22:35 ` Uma Shankar
2018-12-11 22:35 ` [v3 14/14] drivers/video: Constantify function argument for HDMI infoframe log Uma Shankar
` (3 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Uma Shankar @ 2018-12-11 22:35 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: ville.syrjala, maarten.lankhorst
This patch enables modeset whenever HDR metadata
needs to be updated to sink.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
---
drivers/gpu/drm/i915/intel_atomic.c | 15 ++++++++++++++-
drivers/gpu/drm/i915/intel_hdmi.c | 4 ++++
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c
index 8cb02f2..72c3fcb 100644
--- a/drivers/gpu/drm/i915/intel_atomic.c
+++ b/drivers/gpu/drm/i915/intel_atomic.c
@@ -101,6 +101,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)
{
@@ -127,7 +137,10 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn,
new_conn_state->broadcast_rgb != old_conn_state->broadcast_rgb ||
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_source_metadata_blob_ptr,
+ old_conn_state->base.hdr_source_metadata_blob_ptr))
crtc_state->mode_changed = true;
return 0;
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 8d145d4..414768a 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -491,6 +491,10 @@ static void intel_hdmi_set_drm_infoframe(struct intel_encoder *encoder,
struct hdr_static_metadata *hdr_metadata;
int ret;
+ if (!conn_state->hdr_source_metadata_blob_ptr ||
+ conn_state->hdr_source_metadata_blob_ptr->length == 0)
+ return;
+
hdr_metadata = (struct hdr_static_metadata *)
conn_state->hdr_source_metadata_blob_ptr->data;
--
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] 18+ messages in thread
* [v3 14/14] drivers/video: Constantify function argument for HDMI infoframe log
2018-12-11 22:35 [v3 00/14] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
` (12 preceding siblings ...)
2018-12-11 22:35 ` [v3 13/14] drm/i915:Enabled Modeset when HDR Infoframe changes Uma Shankar
@ 2018-12-11 22:35 ` Uma Shankar
2018-12-11 22:41 ` ✗ Fi.CI.CHECKPATCH: warning for Add HDR Metadata Parsing and handling in DRM layer (rev3) Patchwork
` (2 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Uma Shankar @ 2018-12-11 22:35 UTC (permalink / raw)
To: intel-gfx, dri-devel; +Cc: ville.syrjala, maarten.lankhorst
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Function argument for hdmi_drm_infoframe_log is made constant.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Uma Shankar <uma.shankar@intel.com>
---
drivers/video/hdmi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/video/hdmi.c b/drivers/video/hdmi.c
index 0937c8c..7ab8086 100644
--- a/drivers/video/hdmi.c
+++ b/drivers/video/hdmi.c
@@ -1383,8 +1383,8 @@ static void hdmi_audio_infoframe_log(const char *level,
* @frame: HDMI DRM infoframe
*/
static void hdmi_drm_infoframe_log(const char *level,
- struct device *dev,
- struct hdmi_drm_infoframe *frame)
+ struct device *dev,
+ const struct hdmi_drm_infoframe *frame)
{
int 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] 18+ messages in thread
* ✗ Fi.CI.CHECKPATCH: warning for Add HDR Metadata Parsing and handling in DRM layer (rev3)
2018-12-11 22:35 [v3 00/14] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
` (13 preceding siblings ...)
2018-12-11 22:35 ` [v3 14/14] drivers/video: Constantify function argument for HDMI infoframe log Uma Shankar
@ 2018-12-11 22:41 ` Patchwork
2018-12-11 23:01 ` ✓ Fi.CI.BAT: success " Patchwork
2018-12-12 2:56 ` ✓ Fi.CI.IGT: " Patchwork
16 siblings, 0 replies; 18+ messages in thread
From: Patchwork @ 2018-12-11 22:41 UTC (permalink / raw)
To: Uma Shankar; +Cc: intel-gfx
== Series Details ==
Series: Add HDR Metadata Parsing and handling in DRM layer (rev3)
URL : https://patchwork.freedesktop.org/series/25091/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
9feff89ee8cd drm: Add HDR source metadata property
9274c63b5377 drm: Add CEA extended tag blocks and HDR bitfield macros
c0f32ec43843 drm: Parse HDR metadata info from EDID
-:34: CHECK:BRACES: Blank lines aren't necessary after an open brace '{'
#34: FILE: drivers/gpu/drm/drm_edid.c:3834:
+{
+
-:40: CHECK:BRACES: Blank lines aren't necessary before a close brace '}'
#40: FILE: drivers/gpu/drm/drm_edid.c:3840:
+
+}
-:44: CHECK:BRACES: Blank lines aren't necessary after an open brace '{'
#44: FILE: drivers/gpu/drm/drm_edid.c:3844:
+{
+
total: 0 errors, 0 warnings, 3 checks, 57 lines checked
c32feedce988 drm: Parse Colorimetry data block from EDID
-:43: CHECK:LINE_SPACING: Please don't use multiple blank lines
#43: FILE: drivers/gpu/drm/drm_edid.c:3842:
+
+
total: 0 errors, 0 warnings, 1 checks, 44 lines checked
8ba29ca0b12a drm/i915: Attach HDR metadata property to connector
-:21: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#21: FILE: drivers/gpu/drm/i915/intel_hdmi.c:2158:
+ drm_object_attach_property(&connector->base,
+ connector->dev->mode_config.hdr_source_metadata_property, 0);
total: 0 errors, 0 warnings, 1 checks, 8 lines checked
26b04ef7c84c drm: Add HDR capability field to plane structure
-:26: CHECK:BOOL_MEMBER: Avoid using bool structure members because of possible alignment issues - see: https://lkml.org/lkml/2017/11/21/384
#26: FILE: include/drm/drm_plane.h:642:
+ bool hdr_supported;
total: 0 errors, 0 warnings, 1 checks, 9 lines checked
8595788ee7d3 drm: Implement HDR source metadata set and get property handling
-:25: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#25: FILE: drivers/gpu/drm/drm_atomic.c:874:
+ drm_printf(p, "\thdr_metadata_changed=%d\n",
+ state->hdr_metadata_changed);
-:48: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#48: FILE: drivers/gpu/drm/drm_atomic_uapi.c:741:
+ ret = drm_atomic_replace_property_blob_from_id(dev,
+ &state->hdr_source_metadata_blob_ptr,
total: 0 errors, 0 warnings, 2 checks, 39 lines checked
69240a4dd2ec drm: Enable HDR infoframe support
-:54: CHECK:LINE_SPACING: Please don't use multiple blank lines
#54: FILE: drivers/gpu/drm/drm_edid.c:4946:
+
+
-:83: CHECK:LINE_SPACING: Please don't use multiple blank lines
#83: FILE: drivers/gpu/drm/drm_edid.c:4975:
+
+
-:215: ERROR:CODE_INDENT: code indent should use tabs where possible
#215: FILE: drivers/video/hdmi.c:1386:
+ struct device *dev,$
-:215: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#215: FILE: drivers/video/hdmi.c:1386:
+static void hdmi_drm_infoframe_log(const char *level,
+ struct device *dev,
-:215: WARNING:LEADING_SPACE: please, no spaces at the start of a line
#215: FILE: drivers/video/hdmi.c:1386:
+ struct device *dev,$
-:216: ERROR:CODE_INDENT: code indent should use tabs where possible
#216: FILE: drivers/video/hdmi.c:1387:
+ struct hdmi_drm_infoframe *frame)$
-:216: WARNING:LEADING_SPACE: please, no spaces at the start of a line
#216: FILE: drivers/video/hdmi.c:1387:
+ struct hdmi_drm_infoframe *frame)$
-:221: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#221: FILE: drivers/video/hdmi.c:1392:
+ hdmi_infoframe_log_header(level, dev,
+ (struct hdmi_any_infoframe *)frame);
-:234: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#234: FILE: drivers/video/hdmi.c:1405:
+ hdmi_log("max_mastering_display_luminance: %d\n",
+ frame->max_mastering_display_luminance);
-:236: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#236: FILE: drivers/video/hdmi.c:1407:
+ hdmi_log("min_mastering_display_luminance: %d\n",
+ frame->min_mastering_display_luminance);
total: 2 errors, 2 warnings, 6 checks, 279 lines checked
09c5cf8f9dc8 drm/i915: Write HDR infoframe and send to panel
4b5a7e4be9bf drm/i915: [DO NOT MERGE] hack for glk board outputs
2ca030434539 drm/i915: Add HLG EOTF
95b30187cd3b drm/i915: Enable infoframes on GLK+ for HDR
-:47: WARNING:LONG_LINE: line over 100 characters
#47: FILE: drivers/gpu/drm/i915/i915_reg.h:8058:
+#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, 70 lines checked
885017e75a4b drm/i915:Enabled Modeset when HDR Infoframe changes
-:57: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#57: FILE: drivers/gpu/drm/i915/intel_hdmi.c:495:
+ if (!conn_state->hdr_source_metadata_blob_ptr ||
+ conn_state->hdr_source_metadata_blob_ptr->length == 0)
total: 0 errors, 0 warnings, 1 checks, 37 lines checked
def7680b600d drivers/video: Constantify function argument for HDMI infoframe log
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 18+ messages in thread
* ✓ Fi.CI.BAT: success for Add HDR Metadata Parsing and handling in DRM layer (rev3)
2018-12-11 22:35 [v3 00/14] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
` (14 preceding siblings ...)
2018-12-11 22:41 ` ✗ Fi.CI.CHECKPATCH: warning for Add HDR Metadata Parsing and handling in DRM layer (rev3) Patchwork
@ 2018-12-11 23:01 ` Patchwork
2018-12-12 2:56 ` ✓ Fi.CI.IGT: " Patchwork
16 siblings, 0 replies; 18+ messages in thread
From: Patchwork @ 2018-12-11 23:01 UTC (permalink / raw)
To: Uma Shankar; +Cc: intel-gfx
== Series Details ==
Series: Add HDR Metadata Parsing and handling in DRM layer (rev3)
URL : https://patchwork.freedesktop.org/series/25091/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5296 -> Patchwork_11073
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/25091/revisions/3/mbox/
Known issues
------------
Here are the changes found in Patchwork_11073 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live_hangcheck:
- fi-skl-guc: PASS -> DMESG-FAIL [fdo#108593]
* igt@kms_frontbuffer_tracking@basic:
- fi-hsw-peppy: PASS -> DMESG-WARN [fdo#102614]
* igt@pm_rpm@module-reload:
- fi-skl-6700k2: PASS -> INCOMPLETE [fdo#107807]
[fdo#102614]: https://bugs.freedesktop.org/show_bug.cgi?id=102614
[fdo#107807]: https://bugs.freedesktop.org/show_bug.cgi?id=107807
[fdo#108593]: https://bugs.freedesktop.org/show_bug.cgi?id=108593
Participating hosts (48 -> 43)
------------------------------
Additional (1): fi-byt-j1900
Missing (6): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-ctg-p8600 fi-icl-y
Build changes
-------------
* Linux: CI_DRM_5296 -> Patchwork_11073
CI_DRM_5296: 70751bd8a3f27b035d203ecafcad452f4d7c2c15 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4745: 3b52e8a5809a4e860350c59476a456745cd9fee0 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_11073: def7680b600da56d5ca8d170cc80bc267a325402 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
def7680b600d drivers/video: Constantify function argument for HDMI infoframe log
885017e75a4b drm/i915:Enabled Modeset when HDR Infoframe changes
95b30187cd3b drm/i915: Enable infoframes on GLK+ for HDR
2ca030434539 drm/i915: Add HLG EOTF
4b5a7e4be9bf drm/i915: [DO NOT MERGE] hack for glk board outputs
09c5cf8f9dc8 drm/i915: Write HDR infoframe and send to panel
69240a4dd2ec drm: Enable HDR infoframe support
8595788ee7d3 drm: Implement HDR source metadata set and get property handling
26b04ef7c84c drm: Add HDR capability field to plane structure
8ba29ca0b12a drm/i915: Attach HDR metadata property to connector
c32feedce988 drm: Parse Colorimetry data block from EDID
c0f32ec43843 drm: Parse HDR metadata info from EDID
9274c63b5377 drm: Add CEA extended tag blocks and HDR bitfield macros
9feff89ee8cd drm: Add HDR source metadata property
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_11073/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 18+ messages in thread
* ✓ Fi.CI.IGT: success for Add HDR Metadata Parsing and handling in DRM layer (rev3)
2018-12-11 22:35 [v3 00/14] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
` (15 preceding siblings ...)
2018-12-11 23:01 ` ✓ Fi.CI.BAT: success " Patchwork
@ 2018-12-12 2:56 ` Patchwork
16 siblings, 0 replies; 18+ messages in thread
From: Patchwork @ 2018-12-12 2:56 UTC (permalink / raw)
To: Uma Shankar; +Cc: intel-gfx
== Series Details ==
Series: Add HDR Metadata Parsing and handling in DRM layer (rev3)
URL : https://patchwork.freedesktop.org/series/25091/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5296_full -> Patchwork_11073_full
====================================================
Summary
-------
**WARNING**
Minor unknown changes coming with Patchwork_11073_full need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_11073_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_11073_full:
### IGT changes ###
#### Warnings ####
* igt@pm_rc6_residency@rc6-accuracy:
- shard-snb: PASS -> SKIP
* igt@tools_test@tools_test:
- shard-skl: SKIP -> PASS
Known issues
------------
Here are the changes found in Patchwork_11073_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@drm_import_export@import-close-race-flink:
- shard-glk: PASS -> TIMEOUT [fdo#108667]
* igt@gem_eio@in-flight-10ms:
- {shard-iclb}: PASS -> INCOMPLETE [fdo#108343]
* igt@kms_busy@extended-modeset-hang-newfb-render-b:
- {shard-iclb}: NOTRUN -> DMESG-WARN [fdo#107956]
* igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-b:
- {shard-iclb}: PASS -> DMESG-WARN [fdo#107956]
* igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-c:
- shard-glk: NOTRUN -> DMESG-WARN [fdo#107956]
* igt@kms_color@pipe-a-degamma:
- shard-apl: PASS -> FAIL [fdo#104782] / [fdo#108145]
* igt@kms_color@pipe-b-degamma:
- shard-apl: PASS -> FAIL [fdo#104782]
* igt@kms_color@pipe-c-ctm-green-to-red:
- shard-skl: PASS -> FAIL [fdo#107201]
* igt@kms_cursor_crc@cursor-64x21-random:
- shard-apl: PASS -> FAIL [fdo#103232] +11
* igt@kms_cursor_crc@cursor-64x64-suspend:
- shard-apl: PASS -> FAIL [fdo#103191] / [fdo#103232]
* igt@kms_cursor_legacy@pipe-a-torture-move:
- shard-skl: NOTRUN -> INCOMPLETE [fdo#104108]
* igt@kms_draw_crc@draw-method-xrgb2101010-mmap-cpu-xtiled:
- {shard-iclb}: PASS -> WARN [fdo#108336]
* igt@kms_fbcon_fbt@psr-suspend:
- shard-skl: NOTRUN -> FAIL [fdo#107882]
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-skl: PASS -> FAIL [fdo#105363]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render:
- shard-apl: PASS -> FAIL [fdo#103167] +5
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-render:
- {shard-iclb}: PASS -> DMESG-FAIL [fdo#107724]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-move:
- shard-glk: PASS -> FAIL [fdo#103167] +5
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-move:
- {shard-iclb}: PASS -> FAIL [fdo#103167]
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
- {shard-iclb}: PASS -> INCOMPLETE [fdo#107713]
* igt@kms_plane@plane-position-covered-pipe-a-planes:
- shard-apl: PASS -> FAIL [fdo#103166] +1
* igt@kms_plane@plane-position-hole-dpms-pipe-a-planes:
- {shard-iclb}: PASS -> DMESG-WARN [fdo#107724] / [fdo#108336] +2
* igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb:
- shard-glk: PASS -> FAIL [fdo#108145]
* igt@kms_plane_alpha_blend@pipe-c-alpha-opaque-fb:
- shard-apl: PASS -> FAIL [fdo#108145]
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-max:
- shard-skl: NOTRUN -> FAIL [fdo#108145]
* igt@kms_plane_multiple@atomic-pipe-b-tiling-yf:
- {shard-iclb}: PASS -> FAIL [fdo#103166] +2
* igt@kms_plane_multiple@atomic-pipe-c-tiling-x:
- shard-glk: PASS -> FAIL [fdo#103166]
* igt@kms_psr@sprite_plane_move:
- {shard-iclb}: PASS -> DMESG-WARN [fdo#107724] +5
* igt@kms_vblank@pipe-c-ts-continuation-suspend:
- shard-skl: NOTRUN -> INCOMPLETE [fdo#104108] / [fdo#107773]
* igt@pm_backlight@basic-brightness:
- {shard-iclb}: PASS -> INCOMPLETE [fdo#107820]
* igt@pm_rpm@legacy-planes:
- {shard-iclb}: PASS -> DMESG-WARN [fdo#108654] +1
* igt@pm_rpm@legacy-planes-dpms:
- shard-skl: PASS -> INCOMPLETE [fdo#105959] / [fdo#107807]
* {igt@runner@aborted}:
- {shard-iclb}: NOTRUN -> ( 2 FAIL ) [fdo#108654] / [fdo#108756]
#### Possible fixes ####
* igt@kms_color@pipe-b-ctm-negative:
- shard-skl: FAIL [fdo#107361] -> PASS
* igt@kms_color@pipe-c-degamma:
- shard-apl: FAIL [fdo#104782] -> PASS
* igt@kms_cursor_crc@cursor-64x21-sliding:
- shard-apl: FAIL [fdo#103232] -> PASS +1
* igt@kms_draw_crc@draw-method-rgb565-mmap-gtt-xtiled:
- shard-skl: FAIL [fdo#103184] -> PASS
* igt@kms_draw_crc@draw-method-rgb565-render-ytiled:
- {shard-iclb}: WARN [fdo#108336] -> PASS +1
* igt@kms_fbcon_fbt@fbc-suspend:
- shard-kbl: FAIL [fdo#103833] / [fdo#105681] -> PASS
* igt@kms_flip@dpms-off-confusion:
- {shard-iclb}: DMESG-WARN [fdo#107724] -> PASS +21
* igt@kms_flip_tiling@flip-changes-tiling:
- {shard-iclb}: DMESG-WARN [fdo#107724] / [fdo#108336] -> PASS +10
* igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-pwrite:
- {shard-iclb}: DMESG-FAIL [fdo#107724] -> PASS +6
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt:
- shard-apl: FAIL [fdo#103167] -> PASS +1
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-move:
- {shard-iclb}: FAIL [fdo#103167] -> PASS +6
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-move:
- shard-glk: FAIL [fdo#103167] -> PASS
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
- shard-skl: INCOMPLETE [fdo#104108] / [fdo#107773] -> PASS
* igt@kms_plane@pixel-format-pipe-c-planes:
- shard-apl: FAIL [fdo#103166] -> PASS
* igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb:
- shard-apl: FAIL [fdo#108145] -> PASS
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: FAIL [fdo#107815] -> PASS
* igt@kms_plane_multiple@atomic-pipe-a-tiling-x:
- shard-glk: FAIL [fdo#103166] -> PASS
* {igt@kms_rotation_crc@multiplane-rotation-cropping-top}:
- shard-kbl: DMESG-FAIL [fdo#108950] -> PASS
* igt@kms_rotation_crc@sprite-rotation-90:
- shard-glk: INCOMPLETE [fdo#103359] / [k.org#198133] -> PASS
* igt@kms_setmode@basic:
- shard-apl: FAIL [fdo#99912] -> PASS
* igt@kms_vblank@pipe-c-ts-continuation-suspend:
- {shard-iclb}: INCOMPLETE [fdo#107713] -> PASS
* igt@sw_sync@sync_busy_fork_unixsocket:
- {shard-iclb}: INCOMPLETE [fdo#108889] -> PASS
#### Warnings ####
* igt@gem_cpu_reloc@full:
- shard-skl: INCOMPLETE [fdo#108073] -> TIMEOUT [fdo#108248]
* igt@kms_cursor_crc@cursor-256x256-random:
- {shard-iclb}: DMESG-WARN [fdo#107724] / [fdo#108336] -> FAIL [fdo#103232] +3
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-mmap-wc:
- {shard-iclb}: DMESG-FAIL [fdo#107724] -> FAIL [fdo#103167] +1
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-render:
- {shard-iclb}: DMESG-WARN [fdo#107724] / [fdo#108336] -> FAIL [fdo#103167]
* igt@kms_plane@pixel-format-pipe-a-planes:
- {shard-iclb}: DMESG-WARN [fdo#107724] / [fdo#108336] -> FAIL [fdo#103166]
* {igt@kms_plane@pixel-format-pipe-a-planes-source-clamping}:
- {shard-iclb}: DMESG-WARN [fdo#107724] / [fdo#108336] -> FAIL [fdo#108948]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[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#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103359]: https://bugs.freedesktop.org/show_bug.cgi?id=103359
[fdo#103833]: https://bugs.freedesktop.org/show_bug.cgi?id=103833
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#104782]: https://bugs.freedesktop.org/show_bug.cgi?id=104782
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#105681]: https://bugs.freedesktop.org/show_bug.cgi?id=105681
[fdo#105959]: https://bugs.freedesktop.org/show_bug.cgi?id=105959
[fdo#107201]: https://bugs.freedesktop.org/show_bug.cgi?id=107201
[fdo#107361]: https://bugs.freedesktop.org/show_bug.cgi?id=107361
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#107773]: https://bugs.freedesktop.org/show_bug.cgi?id=107773
[fdo#107807]: https://bugs.freedesktop.org/show_bug.cgi?id=107807
[fdo#107815]: https://bugs.freedesktop.org/show_bug.cgi?id=107815
[fdo#107820]: https://bugs.freedesktop.org/show_bug.cgi?id=107820
[fdo#107882]: https://bugs.freedesktop.org/show_bug.cgi?id=107882
[fdo#107956]: https://bugs.freedesktop.org/show_bug.cgi?id=107956
[fdo#108073]: https://bugs.freedesktop.org/show_bug.cgi?id=108073
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108248]: https://bugs.freedesktop.org/show_bug.cgi?id=108248
[fdo#108336]: https://bugs.freedesktop.org/show_bug.cgi?id=108336
[fdo#108343]: https://bugs.freedesktop.org/show_bug.cgi?id=108343
[fdo#108654]: https://bugs.freedesktop.org/show_bug.cgi?id=108654
[fdo#108667]: https://bugs.freedesktop.org/show_bug.cgi?id=108667
[fdo#108756]: https://bugs.freedesktop.org/show_bug.cgi?id=108756
[fdo#108889]: https://bugs.freedesktop.org/show_bug.cgi?id=108889
[fdo#108948]: https://bugs.freedesktop.org/show_bug.cgi?id=108948
[fdo#108950]: https://bugs.freedesktop.org/show_bug.cgi?id=108950
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
[k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133
Participating hosts (7 -> 7)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_5296 -> Patchwork_11073
CI_DRM_5296: 70751bd8a3f27b035d203ecafcad452f4d7c2c15 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4745: 3b52e8a5809a4e860350c59476a456745cd9fee0 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_11073: def7680b600da56d5ca8d170cc80bc267a325402 @ 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_11073/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2018-12-12 2:56 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-11 22:35 [v3 00/14] Add HDR Metadata Parsing and handling in DRM layer Uma Shankar
2018-12-11 22:35 ` [v3 01/14] drm: Add HDR source metadata property Uma Shankar
2018-12-11 22:35 ` [v3 02/14] drm: Add CEA extended tag blocks and HDR bitfield macros Uma Shankar
2018-12-11 22:35 ` [v3 03/14] drm: Parse HDR metadata info from EDID Uma Shankar
2018-12-11 22:35 ` [v3 04/14] drm: Parse Colorimetry data block " Uma Shankar
2018-12-11 22:35 ` [v3 05/14] drm/i915: Attach HDR metadata property to connector Uma Shankar
2018-12-11 22:35 ` [v3 06/14] drm: Add HDR capability field to plane structure Uma Shankar
2018-12-11 22:35 ` [v3 07/14] drm: Implement HDR source metadata set and get property handling Uma Shankar
2018-12-11 22:35 ` [v3 08/14] drm: Enable HDR infoframe support Uma Shankar
2018-12-11 22:35 ` [v3 09/14] drm/i915: Write HDR infoframe and send to panel Uma Shankar
2018-12-11 22:35 ` [v3 10/14] drm/i915: [DO NOT MERGE] hack for glk board outputs Uma Shankar
2018-12-11 22:35 ` [v3 11/14] drm/i915: Add HLG EOTF Uma Shankar
2018-12-11 22:35 ` [v3 12/14] drm/i915: Enable infoframes on GLK+ for HDR Uma Shankar
2018-12-11 22:35 ` [v3 13/14] drm/i915:Enabled Modeset when HDR Infoframe changes Uma Shankar
2018-12-11 22:35 ` [v3 14/14] drivers/video: Constantify function argument for HDMI infoframe log Uma Shankar
2018-12-11 22:41 ` ✗ Fi.CI.CHECKPATCH: warning for Add HDR Metadata Parsing and handling in DRM layer (rev3) Patchwork
2018-12-11 23:01 ` ✓ Fi.CI.BAT: success " Patchwork
2018-12-12 2:56 ` ✓ Fi.CI.IGT: " Patchwork
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.