Skip to contentSkip to conversation

Add Colorspace connector property interface

PATCH Superseded Uma Shankar 4 participants 12 messages Jan 29, 2019 – Jan 30, 2019

Subsystems (3)

v8 of 17 Superseded Latest is v17 →

lore
Share & tools
lore
#0 lore raw

v8 cover Add Colorspace connector property interface

This patch series creates a new connector property to program colorspace to sink devices. Modern sink devices support more than 1 type of colorspace like 601, 709, BT2020 etc. This helps to switch based on content type which is to be displayed. The decision lies with compositors as to in which scenarios, a particular colorspace will be picked.

This will be helpful mostly to switch to higher gamut colorspaces like BT2020 when the media content is encoded as BT2020. Thereby giving a good visual experience to users.

The expectation from userspace is that it should parse the EDID and get supported colorspaces. Use this property and switch to the one supported. Driver will expose the platform supported colorspaces, however sink supported colorspaces should be retrieved by userspace from EDID.

Basically the expectation from userspace is:
- Set up CRTC DEGAMMA/CTM/GAMMA to convert to some sink colorspace
- Set this new property to let the sink know what it converted the CRTC output to.
- This property is just to inform sink what colorspace source is trying to drive.

Have tested this using xrandr by using below command:
xrandr --output HDMI2 --set "Colorspace" "BT2020_rgb"

v2: Addressed Ville and Maarten's review comments. Merged the 2nd and 3rd patch into one common logical patch.

v3: Removed Adobe references from enum definitions as per Ville, Hans Verkuil and Jonas Karlman suggestions. Changed default to an unset state where driver will assign the colorspace when not chosen by user, suggested by Ville and Maarten. Addressed other misc review comments from Maarten. Split the changes to have separate colorspace property for DP and HDMI.

v4: Addressed Chris and Ville's review comments, and created a common colorspace property for DP and HDMI, filtered the list

v5: Modified the colorspace property creation helper to take platform specific enum list based on the capabilities of the platform as suggested by Shashank. With this there is no need for segregation between DP and HDMI.

v6: Addressed Shashank's review comments.

v7: Added defines instead of enum in uapi as per Brian Starkey's suggestion in order to go with string matching at userspace. Updated the kernel doc as well with more details.

v8: Addressed Maarten's review comments.

Uma Shankar (2):
drm: Add colorspace connector property drm/i915: Attach colorspace property and enable modeset

 drivers/gpu/drm/drm_atomic_uapi.c      |  4 ++
 drivers/gpu/drm/drm_connector.c        | 95 ++++++++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_atomic.c    |  1 +
 drivers/gpu/drm/i915/intel_connector.c | 63 ++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_drv.h       |  1 +
 drivers/gpu/drm/i915/intel_hdmi.c      | 24 +++++++++
 include/drm/drm_connector.h            | 17 ++++++
 include/uapi/drm/drm_mode.h            | 32 ++++++++++++
 8 files changed, 237 insertions(+)
Signature · 6 lines
1.9.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#1 lore raw

PATCH v8 1/2 drm: Add colorspace connector property

Create a new connector property to program colorspace to sink devices. Modern sink devices support more than 1 type of colorspace like 601, 709, BT2020 etc. This helps to switch based on content type which is to be displayed. The decision lies with compositors as to in which scenarios, a particular colorspace will be picked.

This will be helpful mostly to switch to higher gamut colorspaces like BT2020 when the media content is encoded as BT2020. Thereby giving a good visual experience to users.

The expectation from userspace is that it should parse the EDID and get supported colorspaces. Use this property and switch to the one supported. Driver will expose the platform supported colorspaces, however sink supported colorspaces should be retrieved by userspace from EDID.

Basically the expectation from userspace is:
- Set up CRTC DEGAMMA/CTM/GAMMA to convert to some sink colorspace
- Set this new property to let the sink know what it converted the CRTC output to.

v2: Addressed Maarten and Ville's review comments. Enhanced the colorspace enum to incorporate both HDMI and DP supported colorspaces. Also, added a default option for colorspace.

v3: Removed Adobe references from enum definitions as per Ville, Hans Verkuil and Jonas Karlman suggestions. Changed Default to an unset state where driver will assign the colorspace is not chosen by user, suggested by Ville and Maarten. Addressed other misc review comments from Maarten. Split the changes to have separate colorspace property for DP and HDMI.

v4: Addressed Chris and Ville's review comments, and created a common colorspace property for DP and HDMI, filtered the list based on the colorspaces supported by the respective protocol standard.

v5: Made the property creation helper accept enum list based on platform capabilties as suggested by Shashank. Consolidated HDMI and DP property creation in the common helper.

v6: Addressed Shashank's review comments.

v7: Added defines instead of enum in uapi as per Brian Starkey's suggestion in order to go with string matching at userspace. Updated the commit message to add more details as well kernel docs.

v8: Addressed Maarten's review comments.

---
 drivers/gpu/drm/drm_atomic_uapi.c |  4 ++
 drivers/gpu/drm/drm_connector.c   | 95 +++++++++++++++++++++++++++++++++++++++
 include/drm/drm_connector.h       | 17 +++++++
 include/uapi/drm/drm_mode.h       | 32 +++++++++++++
 4 files changed, 148 insertions(+)
drivers/gpu/drm/drm_atomic_uapi.c +4 -0
index 9a1f41a..9b5d44f 100644
@@ -746,6 +746,8 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector,
 			return -EINVAL;
 		}
 		state->content_protection = val;
+	} else if (property == connector->colorspace_property) {
+		state->colorspace = val;
 	} else if (property == config->writeback_fb_id_property) {
 		struct drm_framebuffer *fb = drm_framebuffer_lookup(dev, NULL, val);
 		int ret = drm_atomic_set_writeback_fb_for_connector(state, fb);
@@ -814,6 +816,8 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector,
 		*val = state->picture_aspect_ratio;
 	} else if (property == config->content_type_property) {
 		*val = state->content_type;
+	} else if (property == connector->colorspace_property) {
+		*val = state->colorspace;
 	} else if (property == connector->scaling_mode_property) {
 		*val = state->scaling_mode;
 	} else if (property == connector->content_protection_property) {
drivers/gpu/drm/drm_connector.c +95 -0

107 lines not on this page · raw message

include/drm/drm_connector.h +17 -0
index 9941613..e32cd11 100644
@@ -31,6 +31,7 @@
 #include <drm/drm_util.h>
 
 #include <uapi/drm/drm_mode.h>
+#include <drm/drm_property.h>
 
 struct drm_connector_helper_funcs;
 struct drm_modeset_acquire_ctx;
@@ -503,6 +504,13 @@ struct drm_connector_state {
 	unsigned int content_protection;
 
 	/**
+	 * @colorspace: State variable for Connector property to request
+	 * colorspace change on Sink. This is most commonly used to switch
+	 * to wider color gamuts like BT2020.
+	 */
+	u32 colorspace;
+
+	/**
 	 * @writeback_job: Writeback job for writeback connectors
 	 *
 	 * Holds the framebuffer and out-fence for a writeback connector. As
@@ -995,6 +1003,12 @@ struct drm_connector {
 	struct drm_property *content_protection_property;
 
 	/**
+	 * @colorspace_property: Connector property to set the suitable
+	 * colorspace supported by the sink.
+	 */
+	struct drm_property *colorspace_property;
+
+	/**
 	 * @path_blob_ptr:
 	 *
 	 * DRM blob property data for the DP MST path property. This should only
@@ -1269,6 +1283,9 @@ int drm_connector_attach_vrr_capable_property(
 int drm_connector_attach_content_protection_property(
 		struct drm_connector *connector);
 int drm_mode_create_aspect_ratio_property(struct drm_device *dev);
+int drm_mode_create_colorspace_property(struct drm_connector *connector,
+					const struct drm_prop_enum_list *props,
+					int num_values);
 int drm_mode_create_content_type_property(struct drm_device *dev);
 void drm_hdmi_avi_infoframe_content_type(struct hdmi_avi_infoframe *frame,
 					 const struct drm_connector_state *conn_state);
include/uapi/drm/drm_mode.h +32 -0
index a439c2e..14bfda3 100644
@@ -210,6 +210,38 @@
 #define DRM_MODE_CONTENT_PROTECTION_DESIRED     1
 #define DRM_MODE_CONTENT_PROTECTION_ENABLED     2
 
+/*
+ * This is a consolidated colorimetry list supported by HDMI and
+ * DP protocol standard. The respective connectors will register
+ * a property with the subset of this list (supported by that
+ * respective protocol). Userspace will set the colorspace through
+ * a colorspace property which will be created and exposed to
+ * userspace.
+ */
+
+/* For Default case, driver will set the colorspace */
+#define DRM_MODE_COLORIMETRY_DEFAULT			0
+/* CEA 861 Normal Colorimetry options */
+#define DRM_MODE_COLORIMETRY_ITU_601			1
+#define DRM_MODE_COLORIMETRY_ITU_709			2
+/* CEA 861 Extended Colorimetry Options */
+#define DRM_MODE_COLORIMETRY_XV_YCC_601			3
+#define DRM_MODE_COLORIMETRY_XV_YCC_709			4
+#define DRM_MODE_COLORIMETRY_S_YCC_601			5
+#define DRM_MODE_COLORIMETRY_OPYCC_601			6
+#define DRM_MODE_COLORIMETRY_OPRGB			7
+#define DRM_MODE_COLORIMETRY_BT2020_RGB			8
+#define DRM_MODE_COLORIMETRY_BT2020_YCC			9
+#define DRM_MODE_COLORIMETRY_BT2020_CYCC		10
+/* DP MSA Colorimetry Options */
+#define DRM_MODE_DP_COLORIMETRY_Y_CBCR_ITU_601		11
+#define DRM_MODE_DP_COLORIMETRY_Y_CBCR_ITU_709		12
+#define DRM_MODE_DP_COLORIMETRY_SRGB			13
+#define DRM_MODE_DP_COLORIMETRY_RGB_WIDE_GAMUT		14
+#define DRM_MODE_DP_COLORIMETRY_SCRGB			15
+#define DRM_MODE_DP_COLORIMETRY_DCI_P3			16
+#define DRM_MODE_DP_COLORIMETRY_CUSTOM_COLOR_PROFILE	17
+
 struct drm_mode_modeinfo {
 	__u32 clock;
 	__u16 hdisplay;
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

PATCH v8 2/2 drm/i915: Attach colorspace property and enable modeset

In reply to Uma Shankar

This patch attaches the colorspace connector property to the hdmi connector. Based on colorspace change, modeset will be triggered to switch to new colorspace.

Based on colorspace property value create an infoframe with appropriate colorspace. This can be used to send an infoframe packet with proper colorspace value set which will help to enable wider color gamut like BT2020 on sink.

This patch attaches and enables HDMI colorspace, DP will be taken care separately.

v2: Merged the changes of creating infoframe as well to this patch as per Maarten's suggestion.

v3: Addressed review comments from Shashank. Separated HDMI and DP colorspaces as suggested by Ville and Maarten.

v4: Addressed Chris and Ville's review comments, and created a common colorspace property for DP and HDMI, filtered the list based on the colorspaces supported by the respective protocol standard. Handle the default case properly.

v5: Added Platform specific colorspace enums and called the property creation helper using the same.

v6: Addressed Shashank's review comments.

v7: Rebase

v8: Addressed Maarten's review comments.

---
 drivers/gpu/drm/i915/intel_atomic.c    |  1 +
 drivers/gpu/drm/i915/intel_connector.c | 63 ++++++++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_drv.h       |  1 +
 drivers/gpu/drm/i915/intel_hdmi.c      | 24 +++++++++++++
 4 files changed, 89 insertions(+)
drivers/gpu/drm/i915/intel_atomic.c +1 -0
index 16263ad..76b7114 100644
@@ -124,6 +124,7 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn,
 	 */
 	if (new_conn_state->force_audio != old_conn_state->force_audio ||
 	    new_conn_state->broadcast_rgb != old_conn_state->broadcast_rgb ||
+	    new_state->colorspace != old_state->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)
drivers/gpu/drm/i915/intel_connector.c +63 -0

72 lines not on this page · raw message

drivers/gpu/drm/i915/intel_drv.h +1 -0
index 85b913e..5178a9a 100644
@@ -1783,6 +1783,7 @@ int intel_connector_update_modes(struct drm_connector *connector,
 void intel_attach_force_audio_property(struct drm_connector *connector);
 void intel_attach_broadcast_rgb_property(struct drm_connector *connector);
 void intel_attach_aspect_ratio_property(struct drm_connector *connector);
+void intel_attach_colorspace_property(struct drm_connector *connector);
 
 /* intel_csr.c */
 void intel_csr_ucode_init(struct drm_i915_private *);
drivers/gpu/drm/i915/intel_hdmi.c +24 -0
index 97a98e1..9ed00e3 100644
@@ -498,6 +498,24 @@ static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder,
 	else
 		frame.avi.colorspace = HDMI_COLORSPACE_RGB;
 
+	if (conn_state->colorspace == DRM_MODE_COLORIMETRY_DEFAULT) {
+		/* Set ITU 709 as default for HDMI */
+		frame.avi.colorimetry = DRM_MODE_COLORIMETRY_ITU_709;
+	} else if (conn_state->colorspace < DRM_MODE_COLORIMETRY_XV_YCC_601) {
+		frame.avi.colorimetry = conn_state->colorspace;
+	} else {
+		frame.avi.colorimetry = HDMI_COLORIMETRY_EXTENDED;
+		/*
+		 * Starting from extended list where COLORIMETRY_XV_YCC_601
+		 * is the first extended mode and its value is 0 as per HDMI
+		 * specification.
+		 * TODO: This needs to be extended for LSPCON implementation
+		 * as well. Will be implemented separately.
+		 */
+		frame.avi.extended_colorimetry = conn_state->colorspace -
+			DRM_MODE_COLORIMETRY_XV_YCC_601;
+	}
+
 	drm_hdmi_avi_infoframe_quant_range(&frame.avi,
 					   conn_state->connector,
 					   adjusted_mode,
@@ -2143,10 +2161,16 @@ static void intel_hdmi_destroy(struct drm_connector *connector)
 intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *connector)
 {
 	struct drm_i915_private *dev_priv = to_i915(connector->dev);
+	struct intel_digital_port *intel_dig_port =
+				hdmi_to_dig_port(intel_hdmi);
 
 	intel_attach_force_audio_property(connector);
 	intel_attach_broadcast_rgb_property(connector);
 	intel_attach_aspect_ratio_property(connector);
+	/* Attach Colorspace property for Non LSPCON based device */
+	if (!intel_dig_port->lspcon.active)
+		intel_attach_colorspace_property(connector);
+
 	drm_connector_attach_content_type_property(connector);
 	connector->state->picture_aspect_ratio = HDMI_PICTURE_ASPECT_NONE;
 
Signature · 6 lines
1.9.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#3 lore raw

Re: [v8 2/2] drm/i915: Attach colorspace property and enable modeset

Quoted 92 lines · Uma Shankar

This patch attaches the colorspace connector property to the hdmi connector. Based on colorspace change, modeset will be triggered to switch to new colorspace.

Based on colorspace property value create an infoframe with appropriate colorspace. This can be used to send an infoframe packet with proper colorspace value set which will help to enable wider color gamut like BT2020 on sink.

This patch attaches and enables HDMI colorspace, DP will be taken care separately.

v2: Merged the changes of creating infoframe as well to this patch as per Maarten's suggestion.

v3: Addressed review comments from Shashank. Separated HDMI and DP colorspaces as suggested by Ville and Maarten.

v4: Addressed Chris and Ville's review comments, and created a common colorspace property for DP and HDMI, filtered the list based on the colorspaces supported by the respective protocol standard. Handle the default case properly.

v5: Added Platform specific colorspace enums and called the property creation helper using the same.

v6: Addressed Shashank's review comments.

v7: Rebase

v8: Addressed Maarten's review comments.

---
 drivers/gpu/drm/i915/intel_atomic.c    |  1 +
 drivers/gpu/drm/i915/intel_connector.c | 63 ++++++++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_drv.h       |  1 +
 drivers/gpu/drm/i915/intel_hdmi.c      | 24 +++++++++++++
 4 files changed, 89 insertions(+)
drivers/gpu/drm/i915/intel_atomic.c +1 -0
index 16263ad..76b7114 100644
@@ -124,6 +124,7 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn,
 	 */
 	if (new_conn_state->force_audio != old_conn_state->force_audio ||
 	    new_conn_state->broadcast_rgb != old_conn_state->broadcast_rgb ||
+	    new_state->colorspace != old_state->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)
drivers/gpu/drm/i915/intel_connector.c +31 -0
index ee16758..9a12d5e 100644
@@ -30,6 +30,48 @@
 #include "intel_drv.h"
 #include "i915_drv.h"
 
+static const struct drm_prop_enum_list gen10_hdmi_colorspaces[] = {
+	/* For Default case, driver will set the colorspace */
+	{ DRM_MODE_COLORIMETRY_DEFAULT, "Default" },
+	/* Standard Definition Colorimetry based on CEA 861 */
+	{ DRM_MODE_COLORIMETRY_ITU_601, "ITU_601" },
+	{ DRM_MODE_COLORIMETRY_ITU_709, "ITU_709" },
+	/* Standard Definition Colorimetry based on IEC 61966-2-4 */
+	{ DRM_MODE_COLORIMETRY_XV_YCC_601, "XV_YCC_601" },
+	/* High Definition Colorimetry based on IEC 61966-2-4 */
+	{ DRM_MODE_COLORIMETRY_XV_YCC_709, "XV_YCC_709" },
+	/* Colorimetry based on IEC 61966-2-1/Amendment 1 */
+	{ DRM_MODE_COLORIMETRY_S_YCC_601, "S_YCC_601" },
+	/* Colorimetry based on IEC 61966-2-5 [33] */
+	{ DRM_MODE_COLORIMETRY_OPYCC_601, "opYCC_601" },
+	/* Colorimetry based on IEC 61966-2-5 */
+	{ DRM_MODE_COLORIMETRY_OPRGB, "opRGB" },
+	/* Colorimetry based on ITU-R BT.2020 */
+	{ DRM_MODE_COLORIMETRY_BT2020_RGB, "BT2020_RGB" },
+	/* Colorimetry based on ITU-R BT.2020 */
+	{ DRM_MODE_COLORIMETRY_BT2020_YCC, "BT2020_YCC" },
+	/* Colorimetry based on ITU-R BT.2020 */
+	{ DRM_MODE_COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" },
+};
+
+static const struct drm_prop_enum_list legacy_hdmi_colorspaces[] = {
+	/* For Default case, driver will set the colorspace */
+	{ DRM_MODE_COLORIMETRY_DEFAULT, "Default" },
+	/* Standard Definition Colorimetry based on CEA 861 */
+	{ DRM_MODE_COLORIMETRY_ITU_601, "ITU_601" },
+	{ DRM_MODE_COLORIMETRY_ITU_709, "ITU_709" },
+	/* Standard Definition Colorimetry based on IEC 61966-2-4 */

drivers/gpu/drm/i915/intel_connector.c line 73

Quoted 10 lines
drivers/gpu/drm/i915/intel_connector.c +10 -0
+	{ DRM_MODE_COLORIMETRY_XV_YCC_601, "XV_YCC_601" },
+	/* High Definition Colorimetry based on IEC 61966-2-4 */
+	{ DRM_MODE_COLORIMETRY_XV_YCC_709, "XV_YCC_709" },
+	/* Colorimetry based on IEC 61966-2-1/Amendment 1 */
+	{ DRM_MODE_COLORIMETRY_S_YCC_601, "S_YCC_601" },
+	/* Colorimetry based on IEC 61966-2-5 [33] */
+	{ DRM_MODE_COLORIMETRY_OPYCC_601, "opYCC_601" },
+	/* Colorimetry based on IEC 61966-2-5 */
+	{ DRM_MODE_COLORIMETRY_OPRGB, "opRGB" },
+};

Why are we duplicating these in the driver code? And why do we have different sets for gen10 and older?

Quoted 94 lines
drivers/gpu/drm/i915/intel_connector.c +22 -0
+
 int intel_connector_init(struct intel_connector *connector)
 {
 	struct intel_digital_connector_state *conn_state;
@@ -265,3 +307,24 @@ int intel_ddc_get_modes(struct drm_connector *connector,
 			connector->dev->mode_config.aspect_ratio_property,
 			DRM_MODE_PICTURE_ASPECT_NONE);
 }
+
+void
+intel_attach_colorspace_property(struct drm_connector *connector)
+{
+	struct drm_device *dev = connector->dev;
+	struct drm_i915_private *dev_priv = to_i915(dev);
+
+	if (INTEL_GEN(dev_priv) >= 10) {
+		if (!drm_mode_create_colorspace_property(connector,
+			gen10_hdmi_colorspaces,
+			ARRAY_SIZE(gen10_hdmi_colorspaces)))
+			drm_object_attach_property(&connector->base,
+				connector->colorspace_property, 0);
+	} else {
+		if (!drm_mode_create_colorspace_property(connector,
+			legacy_hdmi_colorspaces,
+			ARRAY_SIZE(legacy_hdmi_colorspaces)))
+			drm_object_attach_property(&connector->base,
+				connector->colorspace_property, 0);
+	}
+}
drivers/gpu/drm/i915/intel_drv.h +1 -0
index 85b913e..5178a9a 100644
@@ -1783,6 +1783,7 @@ int intel_connector_update_modes(struct drm_connector *connector,
 void intel_attach_force_audio_property(struct drm_connector *connector);
 void intel_attach_broadcast_rgb_property(struct drm_connector *connector);
 void intel_attach_aspect_ratio_property(struct drm_connector *connector);
+void intel_attach_colorspace_property(struct drm_connector *connector);
 
 /* intel_csr.c */
 void intel_csr_ucode_init(struct drm_i915_private *);
drivers/gpu/drm/i915/intel_hdmi.c +24 -0
index 97a98e1..9ed00e3 100644
@@ -498,6 +498,24 @@ static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder,
 	else
 		frame.avi.colorspace = HDMI_COLORSPACE_RGB;
 
+	if (conn_state->colorspace == DRM_MODE_COLORIMETRY_DEFAULT) {
+		/* Set ITU 709 as default for HDMI */
+		frame.avi.colorimetry = DRM_MODE_COLORIMETRY_ITU_709;
+	} else if (conn_state->colorspace < DRM_MODE_COLORIMETRY_XV_YCC_601) {
+		frame.avi.colorimetry = conn_state->colorspace;
+	} else {
+		frame.avi.colorimetry = HDMI_COLORIMETRY_EXTENDED;
+		/*
+		 * Starting from extended list where COLORIMETRY_XV_YCC_601
+		 * is the first extended mode and its value is 0 as per HDMI
+		 * specification.
+		 * TODO: This needs to be extended for LSPCON implementation
+		 * as well. Will be implemented separately.
+		 */
+		frame.avi.extended_colorimetry = conn_state->colorspace -
+			DRM_MODE_COLORIMETRY_XV_YCC_601;
+	}
+
 	drm_hdmi_avi_infoframe_quant_range(&frame.avi,
 					   conn_state->connector,
 					   adjusted_mode,
@@ -2143,10 +2161,16 @@ static void intel_hdmi_destroy(struct drm_connector *connector)
 intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *connector)
 {
 	struct drm_i915_private *dev_priv = to_i915(connector->dev);
+	struct intel_digital_port *intel_dig_port =
+				hdmi_to_dig_port(intel_hdmi);
 
 	intel_attach_force_audio_property(connector);
 	intel_attach_broadcast_rgb_property(connector);
 	intel_attach_aspect_ratio_property(connector);
+	/* Attach Colorspace property for Non LSPCON based device */
+	if (!intel_dig_port->lspcon.active)
+		intel_attach_colorspace_property(connector);
+
 	drm_connector_attach_content_type_property(connector);
 	connector->state->picture_aspect_ratio = HDMI_PICTURE_ASPECT_NONE;
 
Signature · 6 lines
1.9.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 6 lines
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw

RE: [v8 2/2] drm/i915: Attach colorspace property and enable modeset

Quoted 116 lines

-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ville Syrjälä
Sent: Tuesday, January 29, 2019 9:14 PM
To: Shankar, Uma <[email protected]>
Cc: [email protected]; [email protected]; Syrjala, Ville <[email protected]>; Lankhorst, Maarten <[email protected]>; [email protected]
Subject: Re: [v8 2/2] drm/i915: Attach colorspace property and enable modeset

Quoted 30 lines · Uma Shankar

This patch attaches the colorspace connector property to the hdmi connector. Based on colorspace change, modeset will be triggered to switch to new colorspace.

Based on colorspace property value create an infoframe with appropriate colorspace. This can be used to send an infoframe packet with proper colorspace value set which will help to enable wider color gamut like BT2020 on sink.

This patch attaches and enables HDMI colorspace, DP will be taken care separately.

v2: Merged the changes of creating infoframe as well to this patch as per Maarten's suggestion.

v3: Addressed review comments from Shashank. Separated HDMI and DP colorspaces as suggested by Ville and Maarten.

v4: Addressed Chris and Ville's review comments, and created a common colorspace property for DP and HDMI, filtered the list based on the colorspaces supported by the respective protocol standard. Handle the default case properly.

v5: Added Platform specific colorspace enums and called the property creation helper using the same.

v6: Addressed Shashank's review comments.

v7: Rebase

Quoted 7 lines

v8: Addressed Maarten's review comments.

---
 drivers/gpu/drm/i915/intel_atomic.c    |  1 +
 drivers/gpu/drm/i915/intel_connector.c | 63

++++++++++++++++++++++++++++++++++

drivers/gpu/drm/i915/intel_atomic.c int intel_digital_connector_atomic_check(struct

Quoted 10 lines
 drivers/gpu/drm/i915/intel_drv.h       |  1 +
 drivers/gpu/drm/i915/intel_hdmi.c      | 24 +++++++++++++
 4 files changed, 89 insertions(+)
drivers/gpu/drm/i915/intel_atomic.c +0 -0
index 16263ad..76b7114 100644
@@ -124,6 +124,7 @@ int intel_digital_connector_atomic_check(struct

drm_connector *conn,

Quoted 54 lines
drivers/gpu/drm/i915/intel_atomic.c +0 -0
 	 */
 	if (new_conn_state->force_audio != old_conn_state->force_audio ||
 	    new_conn_state->broadcast_rgb != old_conn_state->broadcast_rgb

||

drivers/gpu/drm/i915/intel_atomic.c +1 -0
+	    new_state->colorspace != old_state->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)

drivers/gpu/drm/i915/intel_connector.c +34 -0
index ee16758..9a12d5e 100644
@@ -30,6 +30,48 @@
 #include "intel_drv.h"
 #include "i915_drv.h"
 
+static const struct drm_prop_enum_list gen10_hdmi_colorspaces[] = {
+	/* For Default case, driver will set the colorspace */
+	{ DRM_MODE_COLORIMETRY_DEFAULT, "Default" },
+	/* Standard Definition Colorimetry based on CEA 861 */
+	{ DRM_MODE_COLORIMETRY_ITU_601, "ITU_601" },
+	{ DRM_MODE_COLORIMETRY_ITU_709, "ITU_709" },
+	/* Standard Definition Colorimetry based on IEC 61966-2-4 */
+	{ DRM_MODE_COLORIMETRY_XV_YCC_601, "XV_YCC_601" },
+	/* High Definition Colorimetry based on IEC 61966-2-4 */
+	{ DRM_MODE_COLORIMETRY_XV_YCC_709, "XV_YCC_709" },
+	/* Colorimetry based on IEC 61966-2-1/Amendment 1 */
+	{ DRM_MODE_COLORIMETRY_S_YCC_601, "S_YCC_601" },
+	/* Colorimetry based on IEC 61966-2-5 [33] */
+	{ DRM_MODE_COLORIMETRY_OPYCC_601, "opYCC_601" },
+	/* Colorimetry based on IEC 61966-2-5 */
+	{ DRM_MODE_COLORIMETRY_OPRGB, "opRGB" },
+	/* Colorimetry based on ITU-R BT.2020 */
+	{ DRM_MODE_COLORIMETRY_BT2020_RGB, "BT2020_RGB" },
+	/* Colorimetry based on ITU-R BT.2020 */
+	{ DRM_MODE_COLORIMETRY_BT2020_YCC, "BT2020_YCC" },
+	/* Colorimetry based on ITU-R BT.2020 */
+	{ DRM_MODE_COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" }, };
+
+static const struct drm_prop_enum_list legacy_hdmi_colorspaces[] = {
+	/* For Default case, driver will set the colorspace */
+	{ DRM_MODE_COLORIMETRY_DEFAULT, "Default" },
+	/* Standard Definition Colorimetry based on CEA 861 */
+	{ DRM_MODE_COLORIMETRY_ITU_601, "ITU_601" },
+	{ DRM_MODE_COLORIMETRY_ITU_709, "ITU_709" },
+	/* Standard Definition Colorimetry based on IEC 61966-2-4 */
+	{ DRM_MODE_COLORIMETRY_XV_YCC_601, "XV_YCC_601" },
+	/* High Definition Colorimetry based on IEC 61966-2-4 */
+	{ DRM_MODE_COLORIMETRY_XV_YCC_709, "XV_YCC_709" },
+	/* Colorimetry based on IEC 61966-2-1/Amendment 1 */
Quoted 8 lines

drivers/gpu/drm/i915/intel_connector.c

Quoted 5 lines
drivers/gpu/drm/i915/intel_connector.c +5 -0
+	{ DRM_MODE_COLORIMETRY_S_YCC_601, "S_YCC_601" },
+	/* Colorimetry based on IEC 61966-2-5 [33] */
+	{ DRM_MODE_COLORIMETRY_OPYCC_601, "opYCC_601" },
+	/* Colorimetry based on IEC 61966-2-5 */
+	{ DRM_MODE_COLORIMETRY_OPRGB, "opRGB" }, };

Why are we duplicating these in the driver code? And why do we have different sets for gen10 and older?

This is to expose colorspaces which a particular platforms supports instead of giving full HDMI protocol supported list as some platforms may not support all of it.

Here, BT2020 support is added for Gen10 onwards, while older platforms support all the rest apart from BT2020.

For sink supported colorspaces, userspace will retrieve it from EDID and set the colorspace which is supported by both platform as well as sink.

Regards,
Uma Shankar

Quoted 101 lines

drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_set_avi_infoframe(struct

Quoted 49 lines
drivers/gpu/drm/i915/intel_connector.c +21 -0
+
 int intel_connector_init(struct intel_connector *connector)  {
 	struct intel_digital_connector_state *conn_state; @@ -265,3 +307,24
 @@ int intel_ddc_get_modes(struct drm_connector *connector,
 			connector->dev->mode_config.aspect_ratio_property,
 			DRM_MODE_PICTURE_ASPECT_NONE);
 }
+
+void
+intel_attach_colorspace_property(struct drm_connector *connector) {
+	struct drm_device *dev = connector->dev;
+	struct drm_i915_private *dev_priv = to_i915(dev);
+
+	if (INTEL_GEN(dev_priv) >= 10) {
+		if (!drm_mode_create_colorspace_property(connector,
+			gen10_hdmi_colorspaces,
+			ARRAY_SIZE(gen10_hdmi_colorspaces)))
+			drm_object_attach_property(&connector->base,
+				connector->colorspace_property, 0);
+	} else {
+		if (!drm_mode_create_colorspace_property(connector,
+			legacy_hdmi_colorspaces,
+			ARRAY_SIZE(legacy_hdmi_colorspaces)))
+			drm_object_attach_property(&connector->base,
+				connector->colorspace_property, 0);
+	}
+}
drivers/gpu/drm/i915/intel_drv.h +0 -0
index 85b913e..5178a9a 100644
@@ -1783,6 +1783,7 @@ int intel_connector_update_modes(struct

drm_connector *connector, void intel_attach_force_audio_property(struct drm_connector *connector); void intel_attach_broadcast_rgb_property(struct drm_connector *connector); void intel_attach_aspect_ratio_property(struct drm_connector *connector);

drivers/gpu/drm/i915/intel_drv.h +2 -0
+void intel_attach_colorspace_property(struct drm_connector
+*connector);
 
 /* intel_csr.c */
 void intel_csr_ucode_init(struct drm_i915_private *); diff --git

a/drivers/gpu/drm/i915/intel_hdmi.c
b/drivers/gpu/drm/i915/intel_hdmi.c
index 97a98e1..9ed00e3 100644

drivers/gpu/drm/i915/intel_hdmi.c +0 -0
@@ -498,6 +498,24 @@ static void intel_hdmi_set_avi_infoframe(struct

intel_encoder *encoder,

drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder,

Quoted 7 lines
drivers/gpu/drm/i915/intel_hdmi.c +4 -0
 	else
 		frame.avi.colorspace = HDMI_COLORSPACE_RGB;
 
+	if (conn_state->colorspace == DRM_MODE_COLORIMETRY_DEFAULT) {
+		/* Set ITU 709 as default for HDMI */
+		frame.avi.colorimetry = DRM_MODE_COLORIMETRY_ITU_709;
+	} else if (conn_state->colorspace <

DRM_MODE_COLORIMETRY_XV_YCC_601) {

Quoted 23 lines
drivers/gpu/drm/i915/intel_hdmi.c +14 -0
+		frame.avi.colorimetry = conn_state->colorspace;
+	} else {
+		frame.avi.colorimetry = HDMI_COLORIMETRY_EXTENDED;
+		/*
+		 * Starting from extended list where COLORIMETRY_XV_YCC_601
+		 * is the first extended mode and its value is 0 as per HDMI
+		 * specification.
+		 * TODO: This needs to be extended for LSPCON implementation
+		 * as well. Will be implemented separately.
+		 */
+		frame.avi.extended_colorimetry = conn_state->colorspace -
+			DRM_MODE_COLORIMETRY_XV_YCC_601;
+	}
+
 	drm_hdmi_avi_infoframe_quant_range(&frame.avi,
 					   conn_state->connector,
 					   adjusted_mode,
@@ -2143,10 +2161,16 @@ static void intel_hdmi_destroy(struct

drm_connector *connector) intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *connector) {

drivers/gpu/drm/i915/intel_hdmi.c +2 -0
 	struct drm_i915_private *dev_priv = to_i915(connector->dev);
+	struct intel_digital_port *intel_dig_port =
+				hdmi_to_dig_port(intel_hdmi);

drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_destroy(struct drm_connector *connector)

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +4 -0
 
 	intel_attach_force_audio_property(connector);
 	intel_attach_broadcast_rgb_property(connector);
 	intel_attach_aspect_ratio_property(connector);
+	/* Attach Colorspace property for Non LSPCON based device */
+	if (!intel_dig_port->lspcon.active)
+		intel_attach_colorspace_property(connector);
+
 	drm_connector_attach_content_type_property(connector);
 	connector->state->picture_aspect_ratio =

HDMI_PICTURE_ASPECT_NONE;

Quoted 8 lines

--
1.9.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Quoted 7 lines

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

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#5 lore raw

Re: [v8 2/2] drm/i915: Attach colorspace property and enable modeset

Quoted 125 lines · Uma
Quoted 116 lines

-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ville Syrjälä
Sent: Tuesday, January 29, 2019 9:14 PM
To: Shankar, Uma <[email protected]>
Cc: [email protected]; [email protected]; Syrjala, Ville <[email protected]>; Lankhorst, Maarten <[email protected]>; [email protected]
Subject: Re: [v8 2/2] drm/i915: Attach colorspace property and enable modeset

Quoted 30 lines · Uma Shankar

This patch attaches the colorspace connector property to the hdmi connector. Based on colorspace change, modeset will be triggered to switch to new colorspace.

Based on colorspace property value create an infoframe with appropriate colorspace. This can be used to send an infoframe packet with proper colorspace value set which will help to enable wider color gamut like BT2020 on sink.

This patch attaches and enables HDMI colorspace, DP will be taken care separately.

v2: Merged the changes of creating infoframe as well to this patch as per Maarten's suggestion.

v3: Addressed review comments from Shashank. Separated HDMI and DP colorspaces as suggested by Ville and Maarten.

v4: Addressed Chris and Ville's review comments, and created a common colorspace property for DP and HDMI, filtered the list based on the colorspaces supported by the respective protocol standard. Handle the default case properly.

v5: Added Platform specific colorspace enums and called the property creation helper using the same.

v6: Addressed Shashank's review comments.

v7: Rebase

Quoted 7 lines

v8: Addressed Maarten's review comments.

---
 drivers/gpu/drm/i915/intel_atomic.c    |  1 +
 drivers/gpu/drm/i915/intel_connector.c | 63

++++++++++++++++++++++++++++++++++

drivers/gpu/drm/i915/intel_atomic.c int intel_digital_connector_atomic_check(struct

Quoted 10 lines
 drivers/gpu/drm/i915/intel_drv.h       |  1 +
 drivers/gpu/drm/i915/intel_hdmi.c      | 24 +++++++++++++
 4 files changed, 89 insertions(+)
drivers/gpu/drm/i915/intel_atomic.c +0 -0
index 16263ad..76b7114 100644
@@ -124,6 +124,7 @@ int intel_digital_connector_atomic_check(struct

drm_connector *conn,

Quoted 54 lines
drivers/gpu/drm/i915/intel_atomic.c +0 -0
 	 */
 	if (new_conn_state->force_audio != old_conn_state->force_audio ||
 	    new_conn_state->broadcast_rgb != old_conn_state->broadcast_rgb

||

drivers/gpu/drm/i915/intel_atomic.c +1 -0
+	    new_state->colorspace != old_state->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)

drivers/gpu/drm/i915/intel_connector.c +34 -0
index ee16758..9a12d5e 100644
@@ -30,6 +30,48 @@
 #include "intel_drv.h"
 #include "i915_drv.h"
 
+static const struct drm_prop_enum_list gen10_hdmi_colorspaces[] = {
+	/* For Default case, driver will set the colorspace */
+	{ DRM_MODE_COLORIMETRY_DEFAULT, "Default" },
+	/* Standard Definition Colorimetry based on CEA 861 */
+	{ DRM_MODE_COLORIMETRY_ITU_601, "ITU_601" },
+	{ DRM_MODE_COLORIMETRY_ITU_709, "ITU_709" },
+	/* Standard Definition Colorimetry based on IEC 61966-2-4 */
+	{ DRM_MODE_COLORIMETRY_XV_YCC_601, "XV_YCC_601" },
+	/* High Definition Colorimetry based on IEC 61966-2-4 */
+	{ DRM_MODE_COLORIMETRY_XV_YCC_709, "XV_YCC_709" },
+	/* Colorimetry based on IEC 61966-2-1/Amendment 1 */
+	{ DRM_MODE_COLORIMETRY_S_YCC_601, "S_YCC_601" },
+	/* Colorimetry based on IEC 61966-2-5 [33] */
+	{ DRM_MODE_COLORIMETRY_OPYCC_601, "opYCC_601" },
+	/* Colorimetry based on IEC 61966-2-5 */
+	{ DRM_MODE_COLORIMETRY_OPRGB, "opRGB" },
+	/* Colorimetry based on ITU-R BT.2020 */
+	{ DRM_MODE_COLORIMETRY_BT2020_RGB, "BT2020_RGB" },
+	/* Colorimetry based on ITU-R BT.2020 */
+	{ DRM_MODE_COLORIMETRY_BT2020_YCC, "BT2020_YCC" },
+	/* Colorimetry based on ITU-R BT.2020 */
+	{ DRM_MODE_COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" }, };
+
+static const struct drm_prop_enum_list legacy_hdmi_colorspaces[] = {
+	/* For Default case, driver will set the colorspace */
+	{ DRM_MODE_COLORIMETRY_DEFAULT, "Default" },
+	/* Standard Definition Colorimetry based on CEA 861 */
+	{ DRM_MODE_COLORIMETRY_ITU_601, "ITU_601" },
+	{ DRM_MODE_COLORIMETRY_ITU_709, "ITU_709" },
+	/* Standard Definition Colorimetry based on IEC 61966-2-4 */
+	{ DRM_MODE_COLORIMETRY_XV_YCC_601, "XV_YCC_601" },
+	/* High Definition Colorimetry based on IEC 61966-2-4 */
+	{ DRM_MODE_COLORIMETRY_XV_YCC_709, "XV_YCC_709" },
+	/* Colorimetry based on IEC 61966-2-1/Amendment 1 */
Quoted 8 lines

drivers/gpu/drm/i915/intel_connector.c

Quoted 5 lines
drivers/gpu/drm/i915/intel_connector.c +5 -0
+	{ DRM_MODE_COLORIMETRY_S_YCC_601, "S_YCC_601" },
+	/* Colorimetry based on IEC 61966-2-5 [33] */
+	{ DRM_MODE_COLORIMETRY_OPYCC_601, "opYCC_601" },
+	/* Colorimetry based on IEC 61966-2-5 */
+	{ DRM_MODE_COLORIMETRY_OPRGB, "opRGB" }, };

Why are we duplicating these in the driver code? And why do we have different sets for gen10 and older?

Quoted 5 lines

This is to expose colorspaces which a particular platforms supports instead of giving full HDMI protocol supported list as some platforms may not support all of it.

Here, BT2020 support is added for Gen10 onwards, while older platforms support all the rest apart from BT2020.

This is just about the infoframe. I don't think we have any platform limitations there.

Quoted 115 lines

For sink supported colorspaces, userspace will retrieve it from EDID and set the colorspace which is supported by both platform as well as sink.

Regards,
Uma Shankar

Quoted 108 lines

drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_set_avi_infoframe(struct

Quoted 49 lines
drivers/gpu/drm/i915/intel_connector.c +21 -0
+
 int intel_connector_init(struct intel_connector *connector)  {
 	struct intel_digital_connector_state *conn_state; @@ -265,3 +307,24
 @@ int intel_ddc_get_modes(struct drm_connector *connector,
 			connector->dev->mode_config.aspect_ratio_property,
 			DRM_MODE_PICTURE_ASPECT_NONE);
 }
+
+void
+intel_attach_colorspace_property(struct drm_connector *connector) {
+	struct drm_device *dev = connector->dev;
+	struct drm_i915_private *dev_priv = to_i915(dev);
+
+	if (INTEL_GEN(dev_priv) >= 10) {
+		if (!drm_mode_create_colorspace_property(connector,
+			gen10_hdmi_colorspaces,
+			ARRAY_SIZE(gen10_hdmi_colorspaces)))
+			drm_object_attach_property(&connector->base,
+				connector->colorspace_property, 0);
+	} else {
+		if (!drm_mode_create_colorspace_property(connector,
+			legacy_hdmi_colorspaces,
+			ARRAY_SIZE(legacy_hdmi_colorspaces)))
+			drm_object_attach_property(&connector->base,
+				connector->colorspace_property, 0);
+	}
+}
drivers/gpu/drm/i915/intel_drv.h +0 -0
index 85b913e..5178a9a 100644
@@ -1783,6 +1783,7 @@ int intel_connector_update_modes(struct

drm_connector *connector, void intel_attach_force_audio_property(struct drm_connector *connector); void intel_attach_broadcast_rgb_property(struct drm_connector *connector); void intel_attach_aspect_ratio_property(struct drm_connector *connector);

drivers/gpu/drm/i915/intel_drv.h +2 -0
+void intel_attach_colorspace_property(struct drm_connector
+*connector);
 
 /* intel_csr.c */
 void intel_csr_ucode_init(struct drm_i915_private *); diff --git

a/drivers/gpu/drm/i915/intel_hdmi.c
b/drivers/gpu/drm/i915/intel_hdmi.c
index 97a98e1..9ed00e3 100644

drivers/gpu/drm/i915/intel_hdmi.c +0 -0
@@ -498,6 +498,24 @@ static void intel_hdmi_set_avi_infoframe(struct

intel_encoder *encoder,

drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder,

Quoted 7 lines
drivers/gpu/drm/i915/intel_hdmi.c +4 -0
 	else
 		frame.avi.colorspace = HDMI_COLORSPACE_RGB;
 
+	if (conn_state->colorspace == DRM_MODE_COLORIMETRY_DEFAULT) {
+		/* Set ITU 709 as default for HDMI */
+		frame.avi.colorimetry = DRM_MODE_COLORIMETRY_ITU_709;
+	} else if (conn_state->colorspace <

DRM_MODE_COLORIMETRY_XV_YCC_601) {

Quoted 23 lines
drivers/gpu/drm/i915/intel_hdmi.c +14 -0
+		frame.avi.colorimetry = conn_state->colorspace;
+	} else {
+		frame.avi.colorimetry = HDMI_COLORIMETRY_EXTENDED;
+		/*
+		 * Starting from extended list where COLORIMETRY_XV_YCC_601
+		 * is the first extended mode and its value is 0 as per HDMI
+		 * specification.
+		 * TODO: This needs to be extended for LSPCON implementation
+		 * as well. Will be implemented separately.
+		 */
+		frame.avi.extended_colorimetry = conn_state->colorspace -
+			DRM_MODE_COLORIMETRY_XV_YCC_601;
+	}
+
 	drm_hdmi_avi_infoframe_quant_range(&frame.avi,
 					   conn_state->connector,
 					   adjusted_mode,
@@ -2143,10 +2161,16 @@ static void intel_hdmi_destroy(struct

drm_connector *connector) intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *connector) {

drivers/gpu/drm/i915/intel_hdmi.c +2 -0
 	struct drm_i915_private *dev_priv = to_i915(connector->dev);
+	struct intel_digital_port *intel_dig_port =
+				hdmi_to_dig_port(intel_hdmi);

drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_destroy(struct drm_connector *connector)

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +4 -0
 
 	intel_attach_force_audio_property(connector);
 	intel_attach_broadcast_rgb_property(connector);
 	intel_attach_aspect_ratio_property(connector);
+	/* Attach Colorspace property for Non LSPCON based device */
+	if (!intel_dig_port->lspcon.active)
+		intel_attach_colorspace_property(connector);
+
 	drm_connector_attach_content_type_property(connector);
 	connector->state->picture_aspect_ratio =

HDMI_PICTURE_ASPECT_NONE;

Quoted 8 lines

--
1.9.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

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

Signature · 6 lines
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#6 lore raw

Re: [v8 2/2] drm/i915: Attach colorspace property and enable modeset

Quoted 141 lines

-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Tuesday, January 29, 2019 9:34 PM
To: Shankar, Uma <[email protected]>
Cc: [email protected]; [email protected]; Syrjala, Ville <[email protected]>; Lankhorst, Maarten <[email protected]>; [email protected]
Subject: Re: [v8 2/2] drm/i915: Attach colorspace property and enable modeset

Quoted 127 lines · Uma
Quoted 118 lines

-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ville Syrjälä
Sent: Tuesday, January 29, 2019 9:14 PM
To: Shankar, Uma <[email protected]>
Cc: [email protected]; [email protected]; Syrjala, Ville <[email protected]>; Lankhorst, Maarten <[email protected]>; [email protected]
Subject: Re: [v8 2/2] drm/i915: Attach colorspace property and enable modeset

Quoted 30 lines · Uma Shankar

This patch attaches the colorspace connector property to the hdmi connector. Based on colorspace change, modeset will be triggered to switch to new colorspace.

Based on colorspace property value create an infoframe with appropriate colorspace. This can be used to send an infoframe packet with proper colorspace value set which will help to enable wider color gamut like BT2020 on sink.

This patch attaches and enables HDMI colorspace, DP will be taken care separately.

v2: Merged the changes of creating infoframe as well to this patch as per Maarten's suggestion.

v3: Addressed review comments from Shashank. Separated HDMI and DP colorspaces as suggested by Ville and Maarten.

v4: Addressed Chris and Ville's review comments, and created a common colorspace property for DP and HDMI, filtered the list based on the colorspaces supported by the respective protocol standard. Handle the default case properly.

v5: Added Platform specific colorspace enums and called the property creation helper using the same.

v6: Addressed Shashank's review comments.

v7: Rebase

Quoted 7 lines

v8: Addressed Maarten's review comments.

---
 drivers/gpu/drm/i915/intel_atomic.c    |  1 +
 drivers/gpu/drm/i915/intel_connector.c | 63

++++++++++++++++++++++++++++++++++

drivers/gpu/drm/i915/intel_atomic.c int intel_digital_connector_atomic_check(struct

Quoted 10 lines
 drivers/gpu/drm/i915/intel_drv.h       |  1 +
 drivers/gpu/drm/i915/intel_hdmi.c      | 24 +++++++++++++
 4 files changed, 89 insertions(+)
drivers/gpu/drm/i915/intel_atomic.c +0 -0
index 16263ad..76b7114 100644
@@ -124,6 +124,7 @@ int intel_digital_connector_atomic_check(struct

drm_connector *conn,

Quoted 55 lines
drivers/gpu/drm/i915/intel_atomic.c +0 -0
 	 */
 	if (new_conn_state->force_audio != old_conn_state->force_audio ||
 	    new_conn_state->broadcast_rgb !=

old_conn_state->broadcast_rgb
||

drivers/gpu/drm/i915/intel_atomic.c +1 -0
+	    new_state->colorspace != old_state->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)

drivers/gpu/drm/i915/intel_connector.c +34 -0
index ee16758..9a12d5e 100644
@@ -30,6 +30,48 @@
 #include "intel_drv.h"
 #include "i915_drv.h"
 
+static const struct drm_prop_enum_list gen10_hdmi_colorspaces[] = {
+	/* For Default case, driver will set the colorspace */
+	{ DRM_MODE_COLORIMETRY_DEFAULT, "Default" },
+	/* Standard Definition Colorimetry based on CEA 861 */
+	{ DRM_MODE_COLORIMETRY_ITU_601, "ITU_601" },
+	{ DRM_MODE_COLORIMETRY_ITU_709, "ITU_709" },
+	/* Standard Definition Colorimetry based on IEC 61966-2-4 */
+	{ DRM_MODE_COLORIMETRY_XV_YCC_601, "XV_YCC_601" },
+	/* High Definition Colorimetry based on IEC 61966-2-4 */
+	{ DRM_MODE_COLORIMETRY_XV_YCC_709, "XV_YCC_709" },
+	/* Colorimetry based on IEC 61966-2-1/Amendment 1 */
+	{ DRM_MODE_COLORIMETRY_S_YCC_601, "S_YCC_601" },
+	/* Colorimetry based on IEC 61966-2-5 [33] */
+	{ DRM_MODE_COLORIMETRY_OPYCC_601, "opYCC_601" },
+	/* Colorimetry based on IEC 61966-2-5 */
+	{ DRM_MODE_COLORIMETRY_OPRGB, "opRGB" },
+	/* Colorimetry based on ITU-R BT.2020 */
+	{ DRM_MODE_COLORIMETRY_BT2020_RGB, "BT2020_RGB" },
+	/* Colorimetry based on ITU-R BT.2020 */
+	{ DRM_MODE_COLORIMETRY_BT2020_YCC, "BT2020_YCC" },
+	/* Colorimetry based on ITU-R BT.2020 */
+	{ DRM_MODE_COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" }, };
+
+static const struct drm_prop_enum_list legacy_hdmi_colorspaces[] = {
+	/* For Default case, driver will set the colorspace */
+	{ DRM_MODE_COLORIMETRY_DEFAULT, "Default" },
+	/* Standard Definition Colorimetry based on CEA 861 */
+	{ DRM_MODE_COLORIMETRY_ITU_601, "ITU_601" },
+	{ DRM_MODE_COLORIMETRY_ITU_709, "ITU_709" },
+	/* Standard Definition Colorimetry based on IEC 61966-2-4 */
+	{ DRM_MODE_COLORIMETRY_XV_YCC_601, "XV_YCC_601" },
+	/* High Definition Colorimetry based on IEC 61966-2-4 */
+	{ DRM_MODE_COLORIMETRY_XV_YCC_709, "XV_YCC_709" },
+	/* Colorimetry based on IEC 61966-2-1/Amendment 1 */
Quoted 8 lines

drivers/gpu/drm/i915/intel_connector.c

Quoted 5 lines
drivers/gpu/drm/i915/intel_connector.c +5 -0
+	{ DRM_MODE_COLORIMETRY_S_YCC_601, "S_YCC_601" },
+	/* Colorimetry based on IEC 61966-2-5 [33] */
+	{ DRM_MODE_COLORIMETRY_OPYCC_601, "opYCC_601" },
+	/* Colorimetry based on IEC 61966-2-5 */
+	{ DRM_MODE_COLORIMETRY_OPRGB, "opRGB" }, };

Why are we duplicating these in the driver code? And why do we have different sets for gen10 and older?

Quoted 2 lines

This is to expose colorspaces which a particular platforms supports instead of giving full HDMI protocol supported list as some platforms may not

Quoted 7 lines

support all of it.

Quoted 3 lines

Here, BT2020 support is added for Gen10 onwards, while older platforms support all the rest apart from BT2020.

This is just about the infoframe. I don't think we have any platform limitations there.

BT2020 is not supported on legacy platforms so we thought to not expose this here as well, else it may lead to confusion. Not sure what's the best approach here. Earlier it was done without any platform checks in v4.

If you suggest to expose all HDMI supported colorspaces, I will make the change and update this series. What do you recommend ?

Regards,
Uma Shankar

Quoted 117 lines
Quoted 116 lines

For sink supported colorspaces, userspace will retrieve it from EDID and set the colorspace which is supported by both platform as well as sink.

Regards,
Uma Shankar

Quoted 109 lines
Quoted 49 lines
drivers/gpu/drm/i915/intel_connector.c +22 -0
+
 int intel_connector_init(struct intel_connector *connector)  {
 	struct intel_digital_connector_state *conn_state; @@ -265,3
+307,24 @@ int intel_ddc_get_modes(struct drm_connector *connector,
 			connector->dev->mode_config.aspect_ratio_property,
 			DRM_MODE_PICTURE_ASPECT_NONE);
 }
+
+void
+intel_attach_colorspace_property(struct drm_connector *connector) {
+	struct drm_device *dev = connector->dev;
+	struct drm_i915_private *dev_priv = to_i915(dev);
+
+	if (INTEL_GEN(dev_priv) >= 10) {
+		if (!drm_mode_create_colorspace_property(connector,
+			gen10_hdmi_colorspaces,
+			ARRAY_SIZE(gen10_hdmi_colorspaces)))
+			drm_object_attach_property(&connector->base,
+				connector->colorspace_property, 0);
+	} else {
+		if (!drm_mode_create_colorspace_property(connector,
+			legacy_hdmi_colorspaces,
+			ARRAY_SIZE(legacy_hdmi_colorspaces)))
+			drm_object_attach_property(&connector->base,
+				connector->colorspace_property, 0);
+	}
+}
drivers/gpu/drm/i915/intel_drv.h +0 -0
index 85b913e..5178a9a 100644
@@ -1783,6 +1783,7 @@ int intel_connector_update_modes(struct

drm_connector *connector, void intel_attach_force_audio_property(struct drm_connector *connector); void intel_attach_broadcast_rgb_property(struct drm_connector *connector); void intel_attach_aspect_ratio_property(struct drm_connector *connector);

drivers/gpu/drm/i915/intel_drv.h +2 -0
+void intel_attach_colorspace_property(struct drm_connector
+*connector);
 
 /* intel_csr.c */
 void intel_csr_ucode_init(struct drm_i915_private *); diff --git

a/drivers/gpu/drm/i915/intel_hdmi.c
b/drivers/gpu/drm/i915/intel_hdmi.c
index 97a98e1..9ed00e3 100644

drivers/gpu/drm/i915/intel_hdmi.c +0 -0
@@ -498,6 +498,24 @@ static void
Quoted 1 line

intel_hdmi_set_avi_infoframe(struct

intel_encoder *encoder,

drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder,

Quoted 7 lines
drivers/gpu/drm/i915/intel_hdmi.c +4 -0
 	else
 		frame.avi.colorspace = HDMI_COLORSPACE_RGB;
 
+	if (conn_state->colorspace == DRM_MODE_COLORIMETRY_DEFAULT) {
+		/* Set ITU 709 as default for HDMI */
+		frame.avi.colorimetry = DRM_MODE_COLORIMETRY_ITU_709;
+	} else if (conn_state->colorspace <

DRM_MODE_COLORIMETRY_XV_YCC_601) {

Quoted 23 lines
drivers/gpu/drm/i915/intel_hdmi.c +14 -0
+		frame.avi.colorimetry = conn_state->colorspace;
+	} else {
+		frame.avi.colorimetry = HDMI_COLORIMETRY_EXTENDED;
+		/*
+		 * Starting from extended list where COLORIMETRY_XV_YCC_601
+		 * is the first extended mode and its value is 0 as per HDMI
+		 * specification.
+		 * TODO: This needs to be extended for LSPCON implementation
+		 * as well. Will be implemented separately.
+		 */
+		frame.avi.extended_colorimetry = conn_state->colorspace -
+			DRM_MODE_COLORIMETRY_XV_YCC_601;
+	}
+
 	drm_hdmi_avi_infoframe_quant_range(&frame.avi,
 					   conn_state->connector,
 					   adjusted_mode,
@@ -2143,10 +2161,16 @@ static void intel_hdmi_destroy(struct

drm_connector *connector) intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *connector) {

drivers/gpu/drm/i915/intel_hdmi.c +2 -0
 	struct drm_i915_private *dev_priv = to_i915(connector->dev);
+	struct intel_digital_port *intel_dig_port =
+				hdmi_to_dig_port(intel_hdmi);

drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_destroy(struct drm_connector *connector)

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +4 -0
 
 	intel_attach_force_audio_property(connector);
 	intel_attach_broadcast_rgb_property(connector);
 	intel_attach_aspect_ratio_property(connector);
+	/* Attach Colorspace property for Non LSPCON based device */
+	if (!intel_dig_port->lspcon.active)
+		intel_attach_colorspace_property(connector);
+
 	drm_connector_attach_content_type_property(connector);
 	connector->state->picture_aspect_ratio =

HDMI_PICTURE_ASPECT_NONE;

Quoted 8 lines

--
1.9.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

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

Quoted 3 lines

--
Ville Syrjälä
Intel

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#7 lore raw

Re: [v8 2/2] drm/i915: Attach colorspace property and enable modeset

Quoted 143 lines · Uma
Quoted 143 lines

-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Tuesday, January 29, 2019 9:34 PM
To: Shankar, Uma <[email protected]>
Cc: [email protected]; [email protected]; Syrjala, Ville <[email protected]>; Lankhorst, Maarten <[email protected]>; [email protected]
Subject: Re: [v8 2/2] drm/i915: Attach colorspace property and enable modeset

Quoted 127 lines · Uma
Quoted 118 lines

-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ville Syrjälä
Sent: Tuesday, January 29, 2019 9:14 PM
To: Shankar, Uma <[email protected]>
Cc: [email protected]; [email protected]; Syrjala, Ville <[email protected]>; Lankhorst, Maarten <[email protected]>; [email protected]
Subject: Re: [v8 2/2] drm/i915: Attach colorspace property and enable modeset

Quoted 30 lines · Uma Shankar

This patch attaches the colorspace connector property to the hdmi connector. Based on colorspace change, modeset will be triggered to switch to new colorspace.

Based on colorspace property value create an infoframe with appropriate colorspace. This can be used to send an infoframe packet with proper colorspace value set which will help to enable wider color gamut like BT2020 on sink.

This patch attaches and enables HDMI colorspace, DP will be taken care separately.

v2: Merged the changes of creating infoframe as well to this patch as per Maarten's suggestion.

v3: Addressed review comments from Shashank. Separated HDMI and DP colorspaces as suggested by Ville and Maarten.

v4: Addressed Chris and Ville's review comments, and created a common colorspace property for DP and HDMI, filtered the list based on the colorspaces supported by the respective protocol standard. Handle the default case properly.

v5: Added Platform specific colorspace enums and called the property creation helper using the same.

v6: Addressed Shashank's review comments.

v7: Rebase

Quoted 7 lines

v8: Addressed Maarten's review comments.

---
 drivers/gpu/drm/i915/intel_atomic.c    |  1 +
 drivers/gpu/drm/i915/intel_connector.c | 63

++++++++++++++++++++++++++++++++++

drivers/gpu/drm/i915/intel_atomic.c int intel_digital_connector_atomic_check(struct

Quoted 10 lines
 drivers/gpu/drm/i915/intel_drv.h       |  1 +
 drivers/gpu/drm/i915/intel_hdmi.c      | 24 +++++++++++++
 4 files changed, 89 insertions(+)
drivers/gpu/drm/i915/intel_atomic.c +0 -0
index 16263ad..76b7114 100644
@@ -124,6 +124,7 @@ int intel_digital_connector_atomic_check(struct

drm_connector *conn,

Quoted 55 lines
drivers/gpu/drm/i915/intel_atomic.c +0 -0
 	 */
 	if (new_conn_state->force_audio != old_conn_state->force_audio ||
 	    new_conn_state->broadcast_rgb !=

old_conn_state->broadcast_rgb
||

drivers/gpu/drm/i915/intel_atomic.c +1 -0
+	    new_state->colorspace != old_state->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)

drivers/gpu/drm/i915/intel_connector.c +34 -0
index ee16758..9a12d5e 100644
@@ -30,6 +30,48 @@
 #include "intel_drv.h"
 #include "i915_drv.h"
 
+static const struct drm_prop_enum_list gen10_hdmi_colorspaces[] = {
+	/* For Default case, driver will set the colorspace */
+	{ DRM_MODE_COLORIMETRY_DEFAULT, "Default" },
+	/* Standard Definition Colorimetry based on CEA 861 */
+	{ DRM_MODE_COLORIMETRY_ITU_601, "ITU_601" },
+	{ DRM_MODE_COLORIMETRY_ITU_709, "ITU_709" },
+	/* Standard Definition Colorimetry based on IEC 61966-2-4 */
+	{ DRM_MODE_COLORIMETRY_XV_YCC_601, "XV_YCC_601" },
+	/* High Definition Colorimetry based on IEC 61966-2-4 */
+	{ DRM_MODE_COLORIMETRY_XV_YCC_709, "XV_YCC_709" },
+	/* Colorimetry based on IEC 61966-2-1/Amendment 1 */
+	{ DRM_MODE_COLORIMETRY_S_YCC_601, "S_YCC_601" },
+	/* Colorimetry based on IEC 61966-2-5 [33] */
+	{ DRM_MODE_COLORIMETRY_OPYCC_601, "opYCC_601" },
+	/* Colorimetry based on IEC 61966-2-5 */
+	{ DRM_MODE_COLORIMETRY_OPRGB, "opRGB" },
+	/* Colorimetry based on ITU-R BT.2020 */
+	{ DRM_MODE_COLORIMETRY_BT2020_RGB, "BT2020_RGB" },
+	/* Colorimetry based on ITU-R BT.2020 */
+	{ DRM_MODE_COLORIMETRY_BT2020_YCC, "BT2020_YCC" },
+	/* Colorimetry based on ITU-R BT.2020 */
+	{ DRM_MODE_COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" }, };
+
+static const struct drm_prop_enum_list legacy_hdmi_colorspaces[] = {
+	/* For Default case, driver will set the colorspace */
+	{ DRM_MODE_COLORIMETRY_DEFAULT, "Default" },
+	/* Standard Definition Colorimetry based on CEA 861 */
+	{ DRM_MODE_COLORIMETRY_ITU_601, "ITU_601" },
+	{ DRM_MODE_COLORIMETRY_ITU_709, "ITU_709" },
+	/* Standard Definition Colorimetry based on IEC 61966-2-4 */
+	{ DRM_MODE_COLORIMETRY_XV_YCC_601, "XV_YCC_601" },
+	/* High Definition Colorimetry based on IEC 61966-2-4 */
+	{ DRM_MODE_COLORIMETRY_XV_YCC_709, "XV_YCC_709" },
+	/* Colorimetry based on IEC 61966-2-1/Amendment 1 */
Quoted 8 lines

drivers/gpu/drm/i915/intel_connector.c

Quoted 5 lines
drivers/gpu/drm/i915/intel_connector.c +5 -0
+	{ DRM_MODE_COLORIMETRY_S_YCC_601, "S_YCC_601" },
+	/* Colorimetry based on IEC 61966-2-5 [33] */
+	{ DRM_MODE_COLORIMETRY_OPYCC_601, "opYCC_601" },
+	/* Colorimetry based on IEC 61966-2-5 */
+	{ DRM_MODE_COLORIMETRY_OPRGB, "opRGB" }, };

Why are we duplicating these in the driver code? And why do we have different sets for gen10 and older?

Quoted 2 lines

This is to expose colorspaces which a particular platforms supports instead of giving full HDMI protocol supported list as some platforms may not

support all of it.

Quoted 1 line
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

Here, BT2020 support is added for Gen10 onwards, while older platforms support all the rest apart from BT2020.

This is just about the infoframe. I don't think we have any platform limitations there.

BT2020 is not supported on legacy platforms so we thought to not expose this here as well, else it may lead to confusion.

Nothing prevents you from scanning out BT.2020 content even on a gen2.

Quoted 129 lines

Not sure what's the best approach here. Earlier it was done without any platform checks in v4.

If you suggest to expose all HDMI supported colorspaces, I will make the change and update this series. What do you recommend ?

Regards,
Uma Shankar

Quoted 120 lines
Quoted 116 lines

For sink supported colorspaces, userspace will retrieve it from EDID and set the colorspace which is supported by both platform as well as sink.

Regards,
Uma Shankar

Quoted 109 lines
Quoted 49 lines
drivers/gpu/drm/i915/intel_connector.c +22 -0
+
 int intel_connector_init(struct intel_connector *connector)  {
 	struct intel_digital_connector_state *conn_state; @@ -265,3
+307,24 @@ int intel_ddc_get_modes(struct drm_connector *connector,
 			connector->dev->mode_config.aspect_ratio_property,
 			DRM_MODE_PICTURE_ASPECT_NONE);
 }
+
+void
+intel_attach_colorspace_property(struct drm_connector *connector) {
+	struct drm_device *dev = connector->dev;
+	struct drm_i915_private *dev_priv = to_i915(dev);
+
+	if (INTEL_GEN(dev_priv) >= 10) {
+		if (!drm_mode_create_colorspace_property(connector,
+			gen10_hdmi_colorspaces,
+			ARRAY_SIZE(gen10_hdmi_colorspaces)))
+			drm_object_attach_property(&connector->base,
+				connector->colorspace_property, 0);
+	} else {
+		if (!drm_mode_create_colorspace_property(connector,
+			legacy_hdmi_colorspaces,
+			ARRAY_SIZE(legacy_hdmi_colorspaces)))
+			drm_object_attach_property(&connector->base,
+				connector->colorspace_property, 0);
+	}
+}
drivers/gpu/drm/i915/intel_drv.h +0 -0
index 85b913e..5178a9a 100644
@@ -1783,6 +1783,7 @@ int intel_connector_update_modes(struct

drm_connector *connector, void intel_attach_force_audio_property(struct drm_connector *connector); void intel_attach_broadcast_rgb_property(struct drm_connector *connector); void intel_attach_aspect_ratio_property(struct drm_connector *connector);

drivers/gpu/drm/i915/intel_drv.h +2 -0
+void intel_attach_colorspace_property(struct drm_connector
+*connector);
 
 /* intel_csr.c */
 void intel_csr_ucode_init(struct drm_i915_private *); diff --git

a/drivers/gpu/drm/i915/intel_hdmi.c
b/drivers/gpu/drm/i915/intel_hdmi.c
index 97a98e1..9ed00e3 100644

drivers/gpu/drm/i915/intel_hdmi.c +0 -0
@@ -498,6 +498,24 @@ static void
Quoted 1 line

intel_hdmi_set_avi_infoframe(struct

intel_encoder *encoder,

drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder,

Quoted 7 lines
drivers/gpu/drm/i915/intel_hdmi.c +4 -0
 	else
 		frame.avi.colorspace = HDMI_COLORSPACE_RGB;
 
+	if (conn_state->colorspace == DRM_MODE_COLORIMETRY_DEFAULT) {
+		/* Set ITU 709 as default for HDMI */
+		frame.avi.colorimetry = DRM_MODE_COLORIMETRY_ITU_709;
+	} else if (conn_state->colorspace <

DRM_MODE_COLORIMETRY_XV_YCC_601) {

Quoted 23 lines
drivers/gpu/drm/i915/intel_hdmi.c +14 -0
+		frame.avi.colorimetry = conn_state->colorspace;
+	} else {
+		frame.avi.colorimetry = HDMI_COLORIMETRY_EXTENDED;
+		/*
+		 * Starting from extended list where COLORIMETRY_XV_YCC_601
+		 * is the first extended mode and its value is 0 as per HDMI
+		 * specification.
+		 * TODO: This needs to be extended for LSPCON implementation
+		 * as well. Will be implemented separately.
+		 */
+		frame.avi.extended_colorimetry = conn_state->colorspace -
+			DRM_MODE_COLORIMETRY_XV_YCC_601;
+	}
+
 	drm_hdmi_avi_infoframe_quant_range(&frame.avi,
 					   conn_state->connector,
 					   adjusted_mode,
@@ -2143,10 +2161,16 @@ static void intel_hdmi_destroy(struct

drm_connector *connector) intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *connector) {

drivers/gpu/drm/i915/intel_hdmi.c +2 -0
 	struct drm_i915_private *dev_priv = to_i915(connector->dev);
+	struct intel_digital_port *intel_dig_port =
+				hdmi_to_dig_port(intel_hdmi);

drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_destroy(struct drm_connector *connector)

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +4 -0
 
 	intel_attach_force_audio_property(connector);
 	intel_attach_broadcast_rgb_property(connector);
 	intel_attach_aspect_ratio_property(connector);
+	/* Attach Colorspace property for Non LSPCON based device */
+	if (!intel_dig_port->lspcon.active)
+		intel_attach_colorspace_property(connector);
+
 	drm_connector_attach_content_type_property(connector);
 	connector->state->picture_aspect_ratio =

HDMI_PICTURE_ASPECT_NONE;

Quoted 8 lines

--
1.9.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

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

--
Ville Syrjälä
Intel

Signature · 6 lines
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#8 lore raw

Re: [v8 2/2] drm/i915: Attach colorspace property and enable modeset

Quoted 164 lines

-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ville Syrjälä
Sent: Tuesday, January 29, 2019 10:09 PM
To: Shankar, Uma <[email protected]>
Cc: Syrjala, Ville <[email protected]>; [email protected]; [email protected]; [email protected]; Lankhorst, Maarten <[email protected]>
Subject: Re: [v8 2/2] drm/i915: Attach colorspace property and enable modeset

Quoted 113 lines · Uma
Quoted 12 lines

-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Tuesday, January 29, 2019 9:34 PM
To: Shankar, Uma <[email protected]>
Cc: [email protected]; [email protected]; Syrjala, Ville <[email protected]>; Lankhorst, Maarten <[email protected]>; [email protected]
Subject: Re: [v8 2/2] drm/i915: Attach colorspace property and enable modeset

Quoted 67 lines
Quoted 66 lines · Uma
Quoted 66 lines

-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ville Syrjälä
Sent: Tuesday, January 29, 2019 9:14 PM
To: Shankar, Uma <[email protected]>
Cc: [email protected]; [email protected]; Syrjala, Ville <[email protected]>; Lankhorst, Maarten <[email protected]>; [email protected]
Subject: Re: [v8 2/2] drm/i915: Attach colorspace property and enable modeset

Quoted 30 lines · Uma Shankar

This patch attaches the colorspace connector property to the hdmi connector. Based on colorspace change, modeset will be triggered to switch to new colorspace.

Based on colorspace property value create an infoframe with appropriate colorspace. This can be used to send an infoframe packet with proper colorspace value set which will help to enable wider color gamut like BT2020 on sink.

This patch attaches and enables HDMI colorspace, DP will be taken care separately.

v2: Merged the changes of creating infoframe as well to this patch as per Maarten's suggestion.

v3: Addressed review comments from Shashank. Separated HDMI and DP colorspaces as suggested by Ville and Maarten.

v4: Addressed Chris and Ville's review comments, and created a common colorspace property for DP and HDMI, filtered the list based on the colorspaces supported by the respective protocol standard. Handle the default case properly.

v5: Added Platform specific colorspace enums and called the property creation helper using the same.

v6: Addressed Shashank's review comments.

v7: Rebase

Quoted 7 lines

v8: Addressed Maarten's review comments.

---
 drivers/gpu/drm/i915/intel_atomic.c    |  1 +
 drivers/gpu/drm/i915/intel_connector.c | 63

++++++++++++++++++++++++++++++++++

Quoted 11 lines
 drivers/gpu/drm/i915/intel_drv.h       |  1 +
 drivers/gpu/drm/i915/intel_hdmi.c      | 24 +++++++++++++
 4 files changed, 89 insertions(+)
drivers/gpu/drm/i915/intel_atomic.c +0 -0
index 16263ad..76b7114 100644
@@ -124,6 +124,7 @@ int

intel_digital_connector_atomic_check(struct

drm_connector *conn,

Quoted 2 lines
drivers/gpu/drm/i915/intel_atomic.c +0 -0
 	 */
 	if (new_conn_state->force_audio != old_conn_state-

force_audio ||

Quoted 33 lines
Quoted 33 lines
Quoted 33 lines
Quoted 33 lines

new_conn_state->broadcast_rgb !=
old_conn_state->broadcast_rgb
||

drivers/gpu/drm/i915/intel_atomic.c +1 -0
+	    new_state->colorspace != old_state->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)

drivers/gpu/drm/i915/intel_connector.c +14 -0
index ee16758..9a12d5e 100644
@@ -30,6 +30,48 @@
 #include "intel_drv.h"
 #include "i915_drv.h"
 
+static const struct drm_prop_enum_list gen10_hdmi_colorspaces[] = {
+	/* For Default case, driver will set the colorspace */
+	{ DRM_MODE_COLORIMETRY_DEFAULT, "Default" },
+	/* Standard Definition Colorimetry based on CEA 861 */
+	{ DRM_MODE_COLORIMETRY_ITU_601, "ITU_601" },
+	{ DRM_MODE_COLORIMETRY_ITU_709, "ITU_709" },
+	/* Standard Definition Colorimetry based on IEC 61966-2-4 */
+	{ DRM_MODE_COLORIMETRY_XV_YCC_601, "XV_YCC_601" },
+	/* High Definition Colorimetry based on IEC 61966-2-4 */
+	{ DRM_MODE_COLORIMETRY_XV_YCC_709, "XV_YCC_709" },
+	/* Colorimetry based on IEC 61966-2-1/Amendment 1 */
+	{ DRM_MODE_COLORIMETRY_S_YCC_601, "S_YCC_601" },
+	/* Colorimetry based on IEC 61966-2-5 [33] */
+	{ DRM_MODE_COLORIMETRY_OPYCC_601, "opYCC_601" },
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

drivers/gpu/drm/i915/intel_connector.c line 54

Quoted 8 lines
drivers/gpu/drm/i915/intel_connector.c +8 -0
+	/* Colorimetry based on IEC 61966-2-5 */
+	{ DRM_MODE_COLORIMETRY_OPRGB, "opRGB" },
+	/* Colorimetry based on ITU-R BT.2020 */
+	{ DRM_MODE_COLORIMETRY_BT2020_RGB, "BT2020_RGB" },
+	/* Colorimetry based on ITU-R BT.2020 */
+	{ DRM_MODE_COLORIMETRY_BT2020_YCC, "BT2020_YCC" },
+	/* Colorimetry based on ITU-R BT.2020 */
+	{ DRM_MODE_COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" },

};

Quoted 29 lines
Quoted 29 lines
Quoted 21 lines
Quoted 12 lines
Quoted 12 lines
drivers/gpu/drm/i915/intel_connector.c +12 -0
+
+static const struct drm_prop_enum_list legacy_hdmi_colorspaces[] = {
+	/* For Default case, driver will set the colorspace */
+	{ DRM_MODE_COLORIMETRY_DEFAULT, "Default" },
+	/* Standard Definition Colorimetry based on CEA 861 */
+	{ DRM_MODE_COLORIMETRY_ITU_601, "ITU_601" },
+	{ DRM_MODE_COLORIMETRY_ITU_709, "ITU_709" },
+	/* Standard Definition Colorimetry based on IEC 61966-2-4 */
+	{ DRM_MODE_COLORIMETRY_XV_YCC_601, "XV_YCC_601" },
+	/* High Definition Colorimetry based on IEC 61966-2-4 */
+	{ DRM_MODE_COLORIMETRY_XV_YCC_709, "XV_YCC_709" },
+	/* Colorimetry based on IEC 61966-2-1/Amendment 1 */
Quoted 8 lines

drivers/gpu/drm/i915/intel_connector.c

Quoted 5 lines
drivers/gpu/drm/i915/intel_connector.c +5 -0
+	{ DRM_MODE_COLORIMETRY_S_YCC_601, "S_YCC_601" },
+	/* Colorimetry based on IEC 61966-2-5 [33] */
+	{ DRM_MODE_COLORIMETRY_OPYCC_601, "opYCC_601" },
+	/* Colorimetry based on IEC 61966-2-5 */
+	{ DRM_MODE_COLORIMETRY_OPRGB, "opRGB" }, };

Why are we duplicating these in the driver code? And why do we have different sets for gen10 and older?

Quoted 3 lines

This is to expose colorspaces which a particular platforms supports instead of giving full HDMI protocol supported list as some platforms may not

support all of it.

Quoted 3 lines

Here, BT2020 support is added for Gen10 onwards, while older platforms support all the rest apart from BT2020.

Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

This is just about the infoframe. I don't think we have any platform limitations there.

BT2020 is not supported on legacy platforms so we thought to not expose this here as well, else it may lead to confusion.

Nothing prevents you from scanning out BT.2020 content even on a gen2.

Ok, I will remove this platform specific implementation and create a generic HDMI colorspace property. Will resend the next version with this updated.

Thanks Ville.

Regards,
Uma Shankar

Quoted 142 lines
Quoted 12 lines

Not sure what's the best approach here. Earlier it was done without any platform checks in v4.

If you suggest to expose all HDMI supported colorspaces, I will make the change and update this series. What do you recommend ?

Regards,
Uma Shankar

Quoted 3 lines
Quoted 3 lines

For sink supported colorspaces, userspace will retrieve it from EDID and set the colorspace which is supported by both platform as well as

sink.

Quoted 59 lines
Quoted 10 lines
Quoted 10 lines

Regards,
Uma Shankar

Quoted 6 lines

drivers/gpu/drm/i915/intel_connector.c line 77

Quoted 6 lines
drivers/gpu/drm/i915/intel_connector.c +3 -0
+
 int intel_connector_init(struct intel_connector *connector)  {
 	struct intel_digital_connector_state *conn_state; @@ -265,3
+307,24 @@ int intel_ddc_get_modes(struct drm_connector
+*connector,
 			connector->dev-

mode_config.aspect_ratio_property,

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
drivers/gpu/drm/i915/intel_connector.c +3 -0
 			DRM_MODE_PICTURE_ASPECT_NONE);  }
+
+void
+intel_attach_colorspace_property(struct drm_connector *connector) {
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

drivers/gpu/drm/i915/intel_connector.c int intel_ddc_get_modes(struct drm_connector *connector,

Quoted 8 lines
drivers/gpu/drm/i915/intel_connector.c +8 -0
+	struct drm_device *dev = connector->dev;
+	struct drm_i915_private *dev_priv = to_i915(dev);
+
+	if (INTEL_GEN(dev_priv) >= 10) {
+		if (!drm_mode_create_colorspace_property(connector,
+			gen10_hdmi_colorspaces,
+			ARRAY_SIZE(gen10_hdmi_colorspaces)))
+			drm_object_attach_property(&connector-

base,

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

drivers/gpu/drm/i915/intel_connector.c int intel_ddc_get_modes(struct drm_connector *connector,

Quoted 6 lines
drivers/gpu/drm/i915/intel_connector.c +6 -0
+				connector->colorspace_property, 0);
+	} else {
+		if (!drm_mode_create_colorspace_property(connector,
+			legacy_hdmi_colorspaces,
+			ARRAY_SIZE(legacy_hdmi_colorspaces)))
+			drm_object_attach_property(&connector-

base,

Quoted 28 lines
Quoted 28 lines
Quoted 28 lines
Quoted 26 lines
drivers/gpu/drm/i915/intel_connector.c +3 -0
+				connector->colorspace_property, 0);
+	}
+}
drivers/gpu/drm/i915/intel_drv.h +0 -0
index 85b913e..5178a9a 100644
@@ -1783,6 +1783,7 @@ int intel_connector_update_modes(struct

drm_connector *connector, void intel_attach_force_audio_property(struct drm_connector *connector); void intel_attach_broadcast_rgb_property(struct drm_connector *connector); void intel_attach_aspect_ratio_property(struct drm_connector *connector);

drivers/gpu/drm/i915/intel_drv.h +2 -1
+void intel_attach_colorspace_property(struct drm_connector
+*connector);
 
 /* intel_csr.c */
 void intel_csr_ucode_init(struct drm_i915_private *); diff
--git a/drivers/gpu/drm/i915/intel_hdmi.c

b/drivers/gpu/drm/i915/intel_hdmi.c
index 97a98e1..9ed00e3 100644

drivers/gpu/drm/i915/intel_hdmi.c +0 -0
@@ -498,6 +498,24 @@ static void
Quoted 1 line

intel_hdmi_set_avi_infoframe(struct

intel_encoder *encoder,

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder,

Quoted 4 lines
drivers/gpu/drm/i915/intel_hdmi.c +1 -0
 	else
 		frame.avi.colorspace = HDMI_COLORSPACE_RGB;
 
+	if (conn_state->colorspace ==

DRM_MODE_COLORIMETRY_DEFAULT) {

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

drivers/gpu/drm/i915/intel_hdmi.c

Quoted 2 lines
drivers/gpu/drm/i915/intel_hdmi.c +2 -0
+		/* Set ITU 709 as default for HDMI */
+		frame.avi.colorimetry =

DRM_MODE_COLORIMETRY_ITU_709;

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

drivers/gpu/drm/i915/intel_hdmi.c

Quoted 1 line
drivers/gpu/drm/i915/intel_hdmi.c +1 -0
+	} else if (conn_state->colorspace <

DRM_MODE_COLORIMETRY_XV_YCC_601) {

drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder,

Quoted 3 lines
drivers/gpu/drm/i915/intel_hdmi.c +3 -0
+		frame.avi.colorimetry = conn_state->colorspace;
+	} else {
+		frame.avi.colorimetry =

HDMI_COLORIMETRY_EXTENDED;

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

drivers/gpu/drm/i915/intel_hdmi.c

Quoted 2 lines
drivers/gpu/drm/i915/intel_hdmi.c +2 -0
+		/*
+		 * Starting from extended list where

COLORIMETRY_XV_YCC_601

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

drivers/gpu/drm/i915/intel_hdmi.c

Quoted 1 line
drivers/gpu/drm/i915/intel_hdmi.c +1 -0
+		 * is the first extended mode and its value is 0 as per

HDMI

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

drivers/gpu/drm/i915/intel_hdmi.c

Quoted 2 lines
drivers/gpu/drm/i915/intel_hdmi.c +2 -0
+		 * specification.
+		 * TODO: This needs to be extended for LSPCON

implementation

Quoted 47 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder,

Quoted 3 lines
drivers/gpu/drm/i915/intel_hdmi.c +3 -0
+		 * as well. Will be implemented separately.
+		 */
+		frame.avi.extended_colorimetry = conn_state-

colorspace -

Quoted 43 lines
Quoted 32 lines
Quoted 32 lines
Quoted 12 lines
drivers/gpu/drm/i915/intel_hdmi.c +3 -0
+			DRM_MODE_COLORIMETRY_XV_YCC_601;
+	}
+
 	drm_hdmi_avi_infoframe_quant_range(&frame.avi,
 					   conn_state->connector,
 					   adjusted_mode,
@@ -2143,10 +2161,16 @@ static void intel_hdmi_destroy(struct

drm_connector *connector) intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *connector) {

drivers/gpu/drm/i915/intel_hdmi.c +2 -0
 	struct drm_i915_private *dev_priv = to_i915(connector->dev);
+	struct intel_digital_port *intel_dig_port =
+				hdmi_to_dig_port(intel_hdmi);

drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_destroy(struct drm_connector *connector)

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +4 -0
 
 	intel_attach_force_audio_property(connector);
 	intel_attach_broadcast_rgb_property(connector);
 	intel_attach_aspect_ratio_property(connector);
+	/* Attach Colorspace property for Non LSPCON based device */
+	if (!intel_dig_port->lspcon.active)
+		intel_attach_colorspace_property(connector);
+
 	drm_connector_attach_content_type_property(connector);
 	connector->state->picture_aspect_ratio =

HDMI_PICTURE_ASPECT_NONE;

Quoted 8 lines

--
1.9.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Quoted 7 lines
Quoted 7 lines

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

--
Ville Syrjälä
Intel

Quoted 7 lines

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

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#9 lore raw

Re: [v8 2/2] drm/i915: Attach colorspace property and enable modeset

In reply to Ville Syrjälä

  Hello Ville,

Quoted 123 lines · Ville Syrjälä
Quoted 122 lines · Uma
Quoted 122 lines

-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ville Syrjälä
Sent: Tuesday, January 29, 2019 9:14 PM
To: Shankar, Uma <[email protected]>
Cc: [email protected]; [email protected]; Syrjala, Ville <[email protected]>; Lankhorst, Maarten <[email protected]>; [email protected]
Subject: Re: [v8 2/2] drm/i915: Attach colorspace property and enable modeset

Quoted 30 lines · Uma Shankar

This patch attaches the colorspace connector property to the hdmi connector. Based on colorspace change, modeset will be triggered to switch to new colorspace.

Based on colorspace property value create an infoframe with appropriate colorspace. This can be used to send an infoframe packet with proper colorspace value set which will help to enable wider color gamut like BT2020 on sink.

This patch attaches and enables HDMI colorspace, DP will be taken care separately.

v2: Merged the changes of creating infoframe as well to this patch as per Maarten's suggestion.

v3: Addressed review comments from Shashank. Separated HDMI and DP colorspaces as suggested by Ville and Maarten.

v4: Addressed Chris and Ville's review comments, and created a common colorspace property for DP and HDMI, filtered the list based on the colorspaces supported by the respective protocol standard. Handle the default case properly.

v5: Added Platform specific colorspace enums and called the property creation helper using the same.

v6: Addressed Shashank's review comments.

v7: Rebase

Quoted 7 lines

v8: Addressed Maarten's review comments.

---
  drivers/gpu/drm/i915/intel_atomic.c    |  1 +
  drivers/gpu/drm/i915/intel_connector.c | 63

++++++++++++++++++++++++++++++++++

drivers/gpu/drm/i915/intel_atomic.c int intel_digital_connector_atomic_check(struct

Quoted 10 lines
  drivers/gpu/drm/i915/intel_drv.h       |  1 +
  drivers/gpu/drm/i915/intel_hdmi.c      | 24 +++++++++++++
  4 files changed, 89 insertions(+)
drivers/gpu/drm/i915/intel_atomic.c +0 -0
index 16263ad..76b7114 100644
@@ -124,6 +124,7 @@ int intel_digital_connector_atomic_check(struct

drm_connector *conn,

Quoted 49 lines
drivers/gpu/drm/i915/intel_atomic.c +0 -0
  	 */
  	if (new_conn_state->force_audio != old_conn_state->force_audio ||
  	    new_conn_state->broadcast_rgb != old_conn_state->broadcast_rgb

||

drivers/gpu/drm/i915/intel_atomic.c +1 -0
+	    new_state->colorspace != old_state->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)

drivers/gpu/drm/i915/intel_connector.c +29 -0
index ee16758..9a12d5e 100644
@@ -30,6 +30,48 @@
  #include "intel_drv.h"
  #include "i915_drv.h"
 
+static const struct drm_prop_enum_list gen10_hdmi_colorspaces[] = {
+	/* For Default case, driver will set the colorspace */
+	{ DRM_MODE_COLORIMETRY_DEFAULT, "Default" },
+	/* Standard Definition Colorimetry based on CEA 861 */
+	{ DRM_MODE_COLORIMETRY_ITU_601, "ITU_601" },
+	{ DRM_MODE_COLORIMETRY_ITU_709, "ITU_709" },
+	/* Standard Definition Colorimetry based on IEC 61966-2-4 */
+	{ DRM_MODE_COLORIMETRY_XV_YCC_601, "XV_YCC_601" },
+	/* High Definition Colorimetry based on IEC 61966-2-4 */
+	{ DRM_MODE_COLORIMETRY_XV_YCC_709, "XV_YCC_709" },
+	/* Colorimetry based on IEC 61966-2-1/Amendment 1 */
+	{ DRM_MODE_COLORIMETRY_S_YCC_601, "S_YCC_601" },
+	/* Colorimetry based on IEC 61966-2-5 [33] */
+	{ DRM_MODE_COLORIMETRY_OPYCC_601, "opYCC_601" },
+	/* Colorimetry based on IEC 61966-2-5 */
+	{ DRM_MODE_COLORIMETRY_OPRGB, "opRGB" },
+	/* Colorimetry based on ITU-R BT.2020 */
+	{ DRM_MODE_COLORIMETRY_BT2020_RGB, "BT2020_RGB" },
+	/* Colorimetry based on ITU-R BT.2020 */
+	{ DRM_MODE_COLORIMETRY_BT2020_YCC, "BT2020_YCC" },
+	/* Colorimetry based on ITU-R BT.2020 */
+	{ DRM_MODE_COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" }, };
+
+static const struct drm_prop_enum_list legacy_hdmi_colorspaces[] = {
+	/* For Default case, driver will set the colorspace */
+	{ DRM_MODE_COLORIMETRY_DEFAULT, "Default" },
+	/* Standard Definition Colorimetry based on CEA 861 */
+	{ DRM_MODE_COLORIMETRY_ITU_601, "ITU_601" },
+	{ DRM_MODE_COLORIMETRY_ITU_709, "ITU_709" },

drivers/gpu/drm/i915/intel_connector.c line 71

Quoted 10 lines
drivers/gpu/drm/i915/intel_connector.c +10 -0
+	/* Standard Definition Colorimetry based on IEC 61966-2-4 */
+	{ DRM_MODE_COLORIMETRY_XV_YCC_601, "XV_YCC_601" },
+	/* High Definition Colorimetry based on IEC 61966-2-4 */
+	{ DRM_MODE_COLORIMETRY_XV_YCC_709, "XV_YCC_709" },
+	/* Colorimetry based on IEC 61966-2-1/Amendment 1 */
+	{ DRM_MODE_COLORIMETRY_S_YCC_601, "S_YCC_601" },
+	/* Colorimetry based on IEC 61966-2-5 [33] */
+	{ DRM_MODE_COLORIMETRY_OPYCC_601, "opYCC_601" },
+	/* Colorimetry based on IEC 61966-2-5 */
+	{ DRM_MODE_COLORIMETRY_OPRGB, "opRGB" }, };

Why are we duplicating these in the driver code? And why do we have different sets for gen10 and older?

Quoted 7 lines
Quoted 5 lines

This is to expose colorspaces which a particular platforms supports instead of giving full HDMI protocol supported list as some platforms may not support all of it.

Here, BT2020 support is added for Gen10 onwards, while older platforms support all the rest apart from BT2020.

This is just about the infoframe. I don't think we have any platform limitations there.

I am not sure about this, reasons:

- this property not only prepares infoframe, but indicates userspace that the platforms has support for following colorspaces. Many userspaces might be taking a call of BT2020/HDR support based on this property.

- Also, can we send CTA-861-G infoframes using a HDMI-1.4b devices ? Even if we can, is that the right thing to do ?

- Shashank

Quoted 105 lines
Quoted 105 lines

For sink supported colorspaces, userspace will retrieve it from EDID and set the colorspace which is supported by both platform as well as sink.

Regards,
Uma Shankar

Quoted 99 lines

drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_set_avi_infoframe(struct

Quoted 49 lines
drivers/gpu/drm/i915/intel_connector.c +21 -0
+
  int intel_connector_init(struct intel_connector *connector)  {
  	struct intel_digital_connector_state *conn_state; @@ -265,3 +307,24
 @@ int intel_ddc_get_modes(struct drm_connector *connector,
  			connector->dev->mode_config.aspect_ratio_property,
  			DRM_MODE_PICTURE_ASPECT_NONE);
  }
+
+void
+intel_attach_colorspace_property(struct drm_connector *connector) {
+	struct drm_device *dev = connector->dev;
+	struct drm_i915_private *dev_priv = to_i915(dev);
+
+	if (INTEL_GEN(dev_priv) >= 10) {
+		if (!drm_mode_create_colorspace_property(connector,
+			gen10_hdmi_colorspaces,
+			ARRAY_SIZE(gen10_hdmi_colorspaces)))
+			drm_object_attach_property(&connector->base,
+				connector->colorspace_property, 0);
+	} else {
+		if (!drm_mode_create_colorspace_property(connector,
+			legacy_hdmi_colorspaces,
+			ARRAY_SIZE(legacy_hdmi_colorspaces)))
+			drm_object_attach_property(&connector->base,
+				connector->colorspace_property, 0);
+	}
+}
drivers/gpu/drm/i915/intel_drv.h +0 -0
index 85b913e..5178a9a 100644
@@ -1783,6 +1783,7 @@ int intel_connector_update_modes(struct

drm_connector *connector, void intel_attach_force_audio_property(struct drm_connector *connector); void intel_attach_broadcast_rgb_property(struct drm_connector *connector); void intel_attach_aspect_ratio_property(struct drm_connector *connector);

drivers/gpu/drm/i915/intel_drv.h +2 -0
+void intel_attach_colorspace_property(struct drm_connector
+*connector);
 
  /* intel_csr.c */
  void intel_csr_ucode_init(struct drm_i915_private *); diff --git

a/drivers/gpu/drm/i915/intel_hdmi.c
b/drivers/gpu/drm/i915/intel_hdmi.c
index 97a98e1..9ed00e3 100644

drivers/gpu/drm/i915/intel_hdmi.c +0 -0
@@ -498,6 +498,24 @@ static void intel_hdmi_set_avi_infoframe(struct

intel_encoder *encoder,

drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder,

Quoted 7 lines
drivers/gpu/drm/i915/intel_hdmi.c +4 -0
  	else
  		frame.avi.colorspace = HDMI_COLORSPACE_RGB;
 
+	if (conn_state->colorspace == DRM_MODE_COLORIMETRY_DEFAULT) {
+		/* Set ITU 709 as default for HDMI */
+		frame.avi.colorimetry = DRM_MODE_COLORIMETRY_ITU_709;
+	} else if (conn_state->colorspace <

DRM_MODE_COLORIMETRY_XV_YCC_601) {

Quoted 23 lines
drivers/gpu/drm/i915/intel_hdmi.c +14 -0
+		frame.avi.colorimetry = conn_state->colorspace;
+	} else {
+		frame.avi.colorimetry = HDMI_COLORIMETRY_EXTENDED;
+		/*
+		 * Starting from extended list where COLORIMETRY_XV_YCC_601
+		 * is the first extended mode and its value is 0 as per HDMI
+		 * specification.
+		 * TODO: This needs to be extended for LSPCON implementation
+		 * as well. Will be implemented separately.
+		 */
+		frame.avi.extended_colorimetry = conn_state->colorspace -
+			DRM_MODE_COLORIMETRY_XV_YCC_601;
+	}
+
  	drm_hdmi_avi_infoframe_quant_range(&frame.avi,
  					   conn_state->connector,
  					   adjusted_mode,
@@ -2143,10 +2161,16 @@ static void intel_hdmi_destroy(struct

drm_connector *connector) intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *connector) {
struct drm_i915_private *dev_priv = to_i915(connector->dev);

drivers/gpu/drm/i915/intel_hdmi.c +2 -0
+	struct intel_digital_port *intel_dig_port =
+				hdmi_to_dig_port(intel_hdmi);

drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_destroy(struct drm_connector *connector)

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +4 -0
 
  	intel_attach_force_audio_property(connector);
  	intel_attach_broadcast_rgb_property(connector);
  	intel_attach_aspect_ratio_property(connector);
+	/* Attach Colorspace property for Non LSPCON based device */
+	if (!intel_dig_port->lspcon.active)
+		intel_attach_colorspace_property(connector);
+
  	drm_connector_attach_content_type_property(connector);
  	connector->state->picture_aspect_ratio =

HDMI_PICTURE_ASPECT_NONE;

Quoted 7 lines

--
1.9.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

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

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#10 lore raw

✗ Fi.CI.CHECKPATCH: warning for Add Colorspace connector property interface (rev8)

In reply to Uma Shankar
== Series Details ==

== Series Details ==

Series: Add Colorspace connector property interface (rev8)
URL : https://patchwork.freedesktop.org/series/47132/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
e750c2ac7554 drm: Add colorspace connector property
c442445b3ffa drm/i915: Attach colorspace property and enable modeset
-:119: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#119: FILE: drivers/gpu/drm/i915/intel_connector.c:319:
+		if (!drm_mode_create_colorspace_property(connector,
+			gen10_hdmi_colorspaces,

-:122: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #122: FILE: drivers/gpu/drm/i915/intel_connector.c:322:
+ drm_object_attach_property(&connector->base,
+ connector->colorspace_property, 0);

-:125: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #125: FILE: drivers/gpu/drm/i915/intel_connector.c:325:
+ if (!drm_mode_create_colorspace_property(connector,
+ legacy_hdmi_colorspaces,

-:128: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #128: FILE: drivers/gpu/drm/i915/intel_connector.c:328:
+ drm_object_attach_property(&connector->base,
+ connector->colorspace_property, 0);

total: 0 errors, 0 warnings, 4 checks, 126 lines checked

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#11 lore raw

✓ Fi.CI.BAT: success for Add Colorspace connector property interface (rev8)

In reply to Uma Shankar
== Series Details ==

== Series Details ==

Series: Add Colorspace connector property interface (rev8)
URL : https://patchwork.freedesktop.org/series/47132/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_5501 -> Patchwork_12073
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://patchwork.freedesktop.org/api/1.0/series/47132/revisions/8/mbox/

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

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

### IGT changes ###

#### Issues hit ####

* igt@gem_exec_suspend@basic-s3:
- fi-blb-e6850: PASS -> INCOMPLETE [fdo#107718]

* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: PASS -> FAIL [fdo#109485]

* igt@kms_pipe_crc_basic@read-crc-pipe-b:
- fi-byt-clapper: PASS -> FAIL [fdo#107362]

* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- fi-byt-clapper: PASS -> FAIL [fdo#103191] / [fdo#107362] +1

* igt@prime_vgem@basic-fence-flip:
- fi-gdg-551: NOTRUN -> FAIL [fdo#103182]

#### Possible fixes ####

* igt@kms_pipe_crc_basic@read-crc-pipe-a-frame-sequence:
- fi-byt-clapper: FAIL [fdo#103191] / [fdo#107362] -> PASS

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

[fdo#103182]: https://bugs.freedesktop.org/show_bug.cgi?id=103182
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#107362]: https://bugs.freedesktop.org/show_bug.cgi?id=107362
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#108915]: https://bugs.freedesktop.org/show_bug.cgi?id=108915
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109485]: https://bugs.freedesktop.org/show_bug.cgi?id=109485

Participating hosts (46 -> 41)
------------------------------

Additional (2): fi-icl-y fi-gdg-551
Missing (7): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-bdw-samus

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

* Linux: CI_DRM_5501 -> Patchwork_12073

CI_DRM_5501: 5aac0b69f3a3085b9b8a9924cb19cb94f7860dbe @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4798: 998e0a4aedf10fb5f7c271018cd80d874668bf55 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12073: c442445b3ffab7ef6c32761f06e733c232daf8cf @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

c442445b3ffa drm/i915: Attach colorspace property and enable modeset e750c2ac7554 drm: Add colorspace connector property

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12073/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx