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. Kernel will not give the supported colorspaces since this is panel dependent and our current property infrastructure is not supporting it.
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 based on the colorspaces supported by the respective protocol standard. Handled the default case more efficiently.
Uma Shankar (3): drm: Add HDMI colorspace property drm: Add DP colorspace property drm/i915: Attach colorspace property and enable modeset
drivers/gpu/drm/drm_atomic_uapi.c | 4 ++ drivers/gpu/drm/drm_connector.c | 92 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_atomic.c | 1 + drivers/gpu/drm/i915/intel_connector.c | 8 +++ drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_hdmi.c | 18 +++++++ include/drm/drm_connector.h | 14 ++++++ include/uapi/drm/drm_mode.h | 33 ++++++++++++ 8 files changed, 171 insertions(+)
This patch adds a HDMI colorspace property, enabling userspace to switch to various supported colorspaces. This will help enable BT2020 along with other colorspaces.
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.
Signed-off-by: Uma Shankar uma.shankar@intel.com --- drivers/gpu/drm/drm_atomic_uapi.c | 4 +++ drivers/gpu/drm/drm_connector.c | 61 +++++++++++++++++++++++++++++++++++++++ include/drm/drm_connector.h | 14 +++++++++ include/uapi/drm/drm_mode.h | 33 +++++++++++++++++++++ 4 files changed, 112 insertions(+)
diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c index 86ac339..9df7520 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -729,6 +729,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); @@ -797,6 +799,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) { diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index fa9baac..57d36e4 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -826,6 +826,30 @@ int drm_display_info_set_bus_formats(struct drm_display_info *info, }; DRM_ENUM_NAME_FN(drm_get_content_protection_name, drm_cp_enum_list)
+static const struct drm_prop_enum_list hdmi_colorspace[] = { + /* For Default case, driver will set the colorspace */ + { COLORIMETRY_DEFAULT, "Default" }, + /* Standard Definition Colorimetry based on CEA 861 */ + { COLORIMETRY_ITU_601, "ITU_601" }, + { COLORIMETRY_ITU_709, "ITU_709" }, + /* Standard Definition Colorimetry based on IEC 61966-2-4 */ + { COLORIMETRY_XV_YCC_601, "XV_YCC_601" }, + /* High Definition Colorimetry based on IEC 61966-2-4 */ + { COLORIMETRY_XV_YCC_709, "XV_YCC_709" }, + /* Colorimetry based on IEC 61966-2-1/Amendment 1 */ + { COLORIMETRY_S_YCC_601, "S_YCC_601" }, + /* Colorimetry based on IEC 61966-2-5 [33] */ + { COLORIMETRY_OPYCC_601, "opYCC_601" }, + /* Colorimetry based on IEC 61966-2-5 */ + { COLORIMETRY_OPRGB, "opRGB" }, + /* Colorimetry based on ITU-R BT.2020 */ + { COLORIMETRY_BT2020_RGB, "BT2020_RGB" }, + /* Colorimetry based on ITU-R BT.2020 */ + { COLORIMETRY_BT2020_YCC, "BT2020_YCC" }, + /* Colorimetry based on ITU-R BT.2020 */ + { COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" }, +}; + /** * DOC: standard connector properties * @@ -1402,6 +1426,43 @@ int drm_mode_create_aspect_ratio_property(struct drm_device *dev) EXPORT_SYMBOL(drm_mode_create_aspect_ratio_property);
/** + * drm_mode_create_colorspace_property - create colorspace property + * Colorspace: + * This property helps select a suitable colorspace based on the sink + * capability. Modern sink devices support wider gamut like BT2020. + * This helps switch to BT2020 mode if the BT2020 encoded video stream + * is being played by the user, same for any other colorspace. + * @connector: connector to set property on. + * + * Called by a driver the first time it's needed, must be attached to desired + * connectors. + * + * Returns: + * Zero on success, negative errno on failure. + */ +int drm_mode_create_colorspace_property(struct drm_connector *connector) +{ + struct drm_device *dev = connector->dev; + struct drm_property *prop; + + if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA || + connector->connector_type == DRM_MODE_CONNECTOR_HDMIB) { + + prop = drm_property_create_enum(dev, DRM_MODE_PROP_ENUM, + "Colorspace", + hdmi_colorspace, + ARRAY_SIZE(hdmi_colorspace)); + if (!prop) + return -ENOMEM; + } + + connector->colorspace_property = prop; + + return 0; +} +EXPORT_SYMBOL(drm_mode_create_colorspace_property); + +/** * drm_mode_create_content_type_property - create content type property * @dev: DRM device * diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index 665b9ca..e98efb1 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -497,6 +497,13 @@ struct drm_connector_state { unsigned int content_protection;
/** + * @colorspace: Connector property to request colorspace + * change on Sink. This is most commonly used to switch to + * wider color gamuts like BT2020. + */ + enum absolute_colorimetry_list colorspace; + + /** * @writeback_job: Writeback job for writeback connectors * * Holds the framebuffer and out-fence for a writeback connector. As @@ -978,6 +985,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 @@ -1248,6 +1261,7 @@ int drm_connector_attach_scaling_mode_property(struct drm_connector *connector, 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); 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); diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index d3e0fe3..42efab8 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h @@ -210,6 +210,39 @@ #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. + */ +enum absolute_colorimetry_list { + /* For Default case, driver will set the colorspace */ + COLORIMETRY_DEFAULT = 0, + /* CEA 861 Normal Colorimetry options */ + COLORIMETRY_ITU_601, + COLORIMETRY_ITU_709, + /* CEA 861 Extended Colorimetry Options */ + COLORIMETRY_XV_YCC_601, + COLORIMETRY_XV_YCC_709, + COLORIMETRY_S_YCC_601, + COLORIMETRY_OPYCC_601, + COLORIMETRY_OPRGB, + COLORIMETRY_BT2020_RGB, + COLORIMETRY_BT2020_YCC, + COLORIMETRY_BT2020_CYCC, + /* DP MSA Colorimetry Options */ + DP_COLORIMETRY_Y_CBCR_ITU_601, + DP_COLORIMETRY_Y_CBCR_ITU_709, + DP_COLORIMETRY_SRGB, + DP_COLORIMETRY_RGB_WIDE_GAMUT, + DP_COLORIMETRY_SCRGB, + DP_COLORIMETRY_DCI_P3, + DP_COLORIMETRY_CUSTOM_COLOR_PROFILE, +}; + struct drm_mode_modeinfo { __u32 clock; __u16 hdisplay;
Hi Uma,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on drm-intel/for-linux-next] [also build test WARNING on v4.20-rc4 next-20181127] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Uma-Shankar/Add-Colorspace-connecto... base: git://anongit.freedesktop.org/drm-intel for-linux-next config: x86_64-randconfig-x017-201847 (attached as .config) compiler: gcc-7 (Debian 7.3.0-1) 7.3.0 reproduce: # save the attached .config to linux build tree make ARCH=x86_64
Note: it may well be a FALSE warning. FWIW you are at least aware of it now. http://gcc.gnu.org/wiki/Better_Uninitialized_Warnings
All warnings (new ones prefixed by >>):
drivers/gpu/drm/drm_connector.c: In function 'drm_mode_create_colorspace_property':
drivers/gpu/drm/drm_connector.c:1459:33: warning: 'prop' may be used uninitialized in this function [-Wmaybe-uninitialized]
connector->colorspace_property = prop; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~
vim +/prop +1459 drivers/gpu/drm/drm_connector.c
1427 1428 /** 1429 * drm_mode_create_colorspace_property - create colorspace property 1430 * Colorspace: 1431 * This property helps select a suitable colorspace based on the sink 1432 * capability. Modern sink devices support wider gamut like BT2020. 1433 * This helps switch to BT2020 mode if the BT2020 encoded video stream 1434 * is being played by the user, same for any other colorspace. 1435 * @connector: connector to set property on. 1436 * 1437 * Called by a driver the first time it's needed, must be attached to desired 1438 * connectors. 1439 * 1440 * Returns: 1441 * Zero on success, negative errno on failure. 1442 */ 1443 int drm_mode_create_colorspace_property(struct drm_connector *connector) 1444 { 1445 struct drm_device *dev = connector->dev; 1446 struct drm_property *prop; 1447 1448 if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA || 1449 connector->connector_type == DRM_MODE_CONNECTOR_HDMIB) { 1450 1451 prop = drm_property_create_enum(dev, DRM_MODE_PROP_ENUM, 1452 "Colorspace", 1453 hdmi_colorspace, 1454 ARRAY_SIZE(hdmi_colorspace)); 1455 if (!prop) 1456 return -ENOMEM; 1457 } 1458
1459 connector->colorspace_property = prop;
1460 1461 return 0; 1462 } 1463 EXPORT_SYMBOL(drm_mode_create_colorspace_property); 1464
--- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation
Regards
Shashank
On 11/27/2018 10:10 PM, Uma Shankar wrote:
This patch adds a HDMI colorspace property, enabling userspace to switch to various supported colorspaces. This will help enable BT2020 along with other colorspaces.
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.
Signed-off-by: Uma Shankar uma.shankar@intel.com
drivers/gpu/drm/drm_atomic_uapi.c | 4 +++ drivers/gpu/drm/drm_connector.c | 61 +++++++++++++++++++++++++++++++++++++++ include/drm/drm_connector.h | 14 +++++++++ include/uapi/drm/drm_mode.h | 33 +++++++++++++++++++++ 4 files changed, 112 insertions(+)
diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c index 86ac339..9df7520 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -729,6 +729,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;@@ -797,6 +799,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;diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index fa9baac..57d36e4 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -826,6 +826,30 @@ int drm_display_info_set_bus_formats(struct drm_display_info *info, }; DRM_ENUM_NAME_FN(drm_get_content_protection_name, drm_cp_enum_list)
+static const struct drm_prop_enum_list hdmi_colorspace[] = {
- /* For Default case, driver will set the colorspace */
- { COLORIMETRY_DEFAULT, "Default" },
- /* Standard Definition Colorimetry based on CEA 861 */
- { COLORIMETRY_ITU_601, "ITU_601" },
- { COLORIMETRY_ITU_709, "ITU_709" },
- /* Standard Definition Colorimetry based on IEC 61966-2-4 */
- { COLORIMETRY_XV_YCC_601, "XV_YCC_601" },
- /* High Definition Colorimetry based on IEC 61966-2-4 */
- { COLORIMETRY_XV_YCC_709, "XV_YCC_709" },
- /* Colorimetry based on IEC 61966-2-1/Amendment 1 */
- { COLORIMETRY_S_YCC_601, "S_YCC_601" },
- /* Colorimetry based on IEC 61966-2-5 [33] */
- { COLORIMETRY_OPYCC_601, "opYCC_601" },
- /* Colorimetry based on IEC 61966-2-5 */
- { COLORIMETRY_OPRGB, "opRGB" },
- /* Colorimetry based on ITU-R BT.2020 */
- { COLORIMETRY_BT2020_RGB, "BT2020_RGB" },
- /* Colorimetry based on ITU-R BT.2020 */
- { COLORIMETRY_BT2020_YCC, "BT2020_YCC" },
- /* Colorimetry based on ITU-R BT.2020 */
- { COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" },
This still doesn't help us with the platform specific colorspace support, like: Even for HDMI, Until GEN10, we don't want to add BT2020 colorspace enum values for Intel driver, which would be difficult to know for a user.
How about we modify the design a drm helper bit like this: 1. Keep the absolute_colorimetry_list as the full range of colorimetry enum values supported by DRM for HDMI display 2. Make the DRM helper accept a series/subset of these enum values, which will be passed from the core driver (like I915), and the DRM functions creates property with these passed values. 3. Call the DRM helper function from functions core driver function (like intel_ddi_init()) from where we already know: - Which display to select enum values from (HDMI/DP) - Which enum values to pick based on current platform (Like if GEN < GEN9, add dont add REC_2020 etc)
- Shashank
+};
- /**
- DOC: standard connector properties
@@ -1402,6 +1426,43 @@ int drm_mode_create_aspect_ratio_property(struct drm_device *dev) EXPORT_SYMBOL(drm_mode_create_aspect_ratio_property);
/**
- drm_mode_create_colorspace_property - create colorspace property
- Colorspace:
This property helps select a suitable colorspace based on the sink
capability. Modern sink devices support wider gamut like BT2020.
This helps switch to BT2020 mode if the BT2020 encoded video stream
is being played by the user, same for any other colorspace.
- @connector: connector to set property on.
- Called by a driver the first time it's needed, must be attached to desired
- connectors.
- Returns:
- Zero on success, negative errno on failure.
- */
+int drm_mode_create_colorspace_property(struct drm_connector *connector) +{
- struct drm_device *dev = connector->dev;
- struct drm_property *prop;
- if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
connector->connector_type == DRM_MODE_CONNECTOR_HDMIB) {prop = drm_property_create_enum(dev, DRM_MODE_PROP_ENUM,"Colorspace",hdmi_colorspace,ARRAY_SIZE(hdmi_colorspace));if (!prop)return -ENOMEM;- }
- connector->colorspace_property = prop;
- return 0;
+} +EXPORT_SYMBOL(drm_mode_create_colorspace_property);
+/**
- drm_mode_create_content_type_property - create content type property
- @dev: DRM device
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index 665b9ca..e98efb1 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -497,6 +497,13 @@ struct drm_connector_state { unsigned int content_protection;
/**
* @colorspace: Connector property to request colorspace* change on Sink. This is most commonly used to switch to* wider color gamuts like BT2020.*/- enum absolute_colorimetry_list colorspace;
- /**
- @writeback_job: Writeback job for writeback connectors
- Holds the framebuffer and out-fence for a writeback connector. As
@@ -978,6 +985,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
@@ -1248,6 +1261,7 @@ int drm_connector_attach_scaling_mode_property(struct drm_connector *connector, 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); 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); diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index d3e0fe3..42efab8 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h @@ -210,6 +210,39 @@ #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.
- */
+enum absolute_colorimetry_list {
- /* For Default case, driver will set the colorspace */
- COLORIMETRY_DEFAULT = 0,
- /* CEA 861 Normal Colorimetry options */
- COLORIMETRY_ITU_601,
- COLORIMETRY_ITU_709,
- /* CEA 861 Extended Colorimetry Options */
- COLORIMETRY_XV_YCC_601,
- COLORIMETRY_XV_YCC_709,
- COLORIMETRY_S_YCC_601,
- COLORIMETRY_OPYCC_601,
- COLORIMETRY_OPRGB,
- COLORIMETRY_BT2020_RGB,
- COLORIMETRY_BT2020_YCC,
- COLORIMETRY_BT2020_CYCC,
- /* DP MSA Colorimetry Options */
- DP_COLORIMETRY_Y_CBCR_ITU_601,
- DP_COLORIMETRY_Y_CBCR_ITU_709,
- DP_COLORIMETRY_SRGB,
- DP_COLORIMETRY_RGB_WIDE_GAMUT,
- DP_COLORIMETRY_SCRGB,
- DP_COLORIMETRY_DCI_P3,
- DP_COLORIMETRY_CUSTOM_COLOR_PROFILE,
+};
- struct drm_mode_modeinfo { __u32 clock; __u16 hdisplay;
-----Original Message----- From: Sharma, Shashank Sent: Wednesday, November 28, 2018 9:41 PM To: Shankar, Uma uma.shankar@intel.com; intel-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org Cc: Lankhorst, Maarten maarten.lankhorst@intel.com; Syrjala, Ville ville.syrjala@intel.com; jonas@kwiboo.se; hansverk@cisco.com; Brian.Starkey@arm.com Subject: Re: [v4 1/3] drm: Add HDMI colorspace property
Regards
Shashank
On 11/27/2018 10:10 PM, Uma Shankar wrote:
This patch adds a HDMI colorspace property, enabling userspace to switch to various supported colorspaces. This will help enable BT2020 along with other colorspaces.
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.
Signed-off-by: Uma Shankar uma.shankar@intel.com
drivers/gpu/drm/drm_atomic_uapi.c | 4 +++ drivers/gpu/drm/drm_connector.c | 61
+++++++++++++++++++++++++++++++++++++++
include/drm/drm_connector.h | 14 +++++++++ include/uapi/drm/drm_mode.h | 33 +++++++++++++++++++++ 4 files changed, 112 insertions(+)
diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c index 86ac339..9df7520 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -729,6 +729,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;NULL, val);
int ret = drm_atomic_set_writeback_fb_for_connector(state,fb); @@
-797,6 +799,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;diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index fa9baac..57d36e4 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -826,6 +826,30 @@ int drm_display_info_set_bus_formats(struct
drm_display_info *info,
}; DRM_ENUM_NAME_FN(drm_get_content_protection_name,
drm_cp_enum_list)
+static const struct drm_prop_enum_list hdmi_colorspace[] = {
- /* For Default case, driver will set the colorspace */
- { COLORIMETRY_DEFAULT, "Default" },
- /* Standard Definition Colorimetry based on CEA 861 */
- { COLORIMETRY_ITU_601, "ITU_601" },
- { COLORIMETRY_ITU_709, "ITU_709" },
- /* Standard Definition Colorimetry based on IEC 61966-2-4 */
- { COLORIMETRY_XV_YCC_601, "XV_YCC_601" },
- /* High Definition Colorimetry based on IEC 61966-2-4 */
- { COLORIMETRY_XV_YCC_709, "XV_YCC_709" },
- /* Colorimetry based on IEC 61966-2-1/Amendment 1 */
- { COLORIMETRY_S_YCC_601, "S_YCC_601" },
- /* Colorimetry based on IEC 61966-2-5 [33] */
- { COLORIMETRY_OPYCC_601, "opYCC_601" },
- /* Colorimetry based on IEC 61966-2-5 */
- { COLORIMETRY_OPRGB, "opRGB" },
- /* Colorimetry based on ITU-R BT.2020 */
- { COLORIMETRY_BT2020_RGB, "BT2020_RGB" },
- /* Colorimetry based on ITU-R BT.2020 */
- { COLORIMETRY_BT2020_YCC, "BT2020_YCC" },
- /* Colorimetry based on ITU-R BT.2020 */
- { COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" },
This still doesn't help us with the platform specific colorspace support, like: Even for HDMI, Until GEN10, we don't want to add BT2020 colorspace enum values for Intel driver, which would be difficult to know for a user.
How about we modify the design a drm helper bit like this:
- Keep the absolute_colorimetry_list as the full range of colorimetry enum
values supported by DRM for HDMI display 2. Make the DRM helper accept a series/subset of these enum values, which will be passed from the core driver (like I915), and the DRM functions creates property with these passed values. 3. Call the DRM helper function from functions core driver function (like intel_ddi_init()) from where we already know: - Which display to select enum values from (HDMI/DP) - Which enum values to pick based on current platform (Like if GEN < GEN9, add dont add REC_2020 etc)
This sounds good, thanks Shashank. I can develop along these lines. The sink capability will still be on userspace, but atleast the platform capabilities can be taken care inside driver itself. I hope this approach is ok with community ?
Regards, Uma Shankar
- Shashank
+};
- /**
- DOC: standard connector properties
@@ -1402,6 +1426,43 @@ int drm_mode_create_aspect_ratio_property(struct
drm_device *dev)
EXPORT_SYMBOL(drm_mode_create_aspect_ratio_property);
/**
- drm_mode_create_colorspace_property - create colorspace property
- Colorspace:
This property helps select a suitable colorspace based on the sink
capability. Modern sink devices support wider gamut like BT2020.
This helps switch to BT2020 mode if the BT2020 encoded video stream
is being played by the user, same for any other colorspace.
- @connector: connector to set property on.
- Called by a driver the first time it's needed, must be attached to
+desired
- connectors.
- Returns:
- Zero on success, negative errno on failure.
- */
+int drm_mode_create_colorspace_property(struct drm_connector +*connector) {
- struct drm_device *dev = connector->dev;
- struct drm_property *prop;
- if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
connector->connector_type ==DRM_MODE_CONNECTOR_HDMIB) {
prop = drm_property_create_enum(dev,DRM_MODE_PROP_ENUM,
"Colorspace",hdmi_colorspace,ARRAY_SIZE(hdmi_colorspace));if (!prop)return -ENOMEM;- }
- connector->colorspace_property = prop;
- return 0;
+} +EXPORT_SYMBOL(drm_mode_create_colorspace_property);
+/**
- drm_mode_create_content_type_property - create content type property
- @dev: DRM device
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index 665b9ca..e98efb1 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -497,6 +497,13 @@ struct drm_connector_state { unsigned int content_protection;
/**
* @colorspace: Connector property to request colorspace* change on Sink. This is most commonly used to switch to* wider color gamuts like BT2020.*/- enum absolute_colorimetry_list colorspace;
- /**
- @writeback_job: Writeback job for writeback connectors
- Holds the framebuffer and out-fence for a writeback connector.
As @@ -978,6 +985,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 @@ -1248,6 +1261,7 @@ int
drm_connector_attach_scaling_mode_property(struct drm_connector *connector,
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); 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); diff --git
a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index d3e0fe3..42efab8 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h @@ -210,6 +210,39 @@ #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.
- */
+enum absolute_colorimetry_list {
- /* For Default case, driver will set the colorspace */
- COLORIMETRY_DEFAULT = 0,
- /* CEA 861 Normal Colorimetry options */
- COLORIMETRY_ITU_601,
- COLORIMETRY_ITU_709,
- /* CEA 861 Extended Colorimetry Options */
- COLORIMETRY_XV_YCC_601,
- COLORIMETRY_XV_YCC_709,
- COLORIMETRY_S_YCC_601,
- COLORIMETRY_OPYCC_601,
- COLORIMETRY_OPRGB,
- COLORIMETRY_BT2020_RGB,
- COLORIMETRY_BT2020_YCC,
- COLORIMETRY_BT2020_CYCC,
- /* DP MSA Colorimetry Options */
- DP_COLORIMETRY_Y_CBCR_ITU_601,
- DP_COLORIMETRY_Y_CBCR_ITU_709,
- DP_COLORIMETRY_SRGB,
- DP_COLORIMETRY_RGB_WIDE_GAMUT,
- DP_COLORIMETRY_SCRGB,
- DP_COLORIMETRY_DCI_P3,
- DP_COLORIMETRY_CUSTOM_COLOR_PROFILE,
+};
- struct drm_mode_modeinfo { __u32 clock; __u16 hdisplay;
This patch adds a DP colorspace property, enabling userspace to switch to various supported colorspaces. This will help enable BT2020 along with other colorspaces.
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: 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.
Signed-off-by: Uma Shankar uma.shankar@intel.com --- drivers/gpu/drm/drm_connector.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 57d36e4..30e2e6f 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -850,6 +850,29 @@ int drm_display_info_set_bus_formats(struct drm_display_info *info, { COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" }, };
+static const struct drm_prop_enum_list dp_colorspace[] = { + /* For Default case, driver will set the colorspace */ + { COLORIMETRY_DEFAULT, "Default" }, + /* Standard Definition Colorimetry based on CEA 861 */ + { COLORIMETRY_ITU_601, "ITU_601" }, + { COLORIMETRY_ITU_709, "ITU_709" }, + /* Standard Definition Colorimetry based on IEC 61966-2-4 */ + { COLORIMETRY_XV_YCC_601, "XV_YCC_601" }, + /* High Definition Colorimetry based on IEC 61966-2-4 */ + { COLORIMETRY_XV_YCC_709, "XV_YCC_709" }, + /* Colorimetry based on IEC 61966-2-5 */ + { COLORIMETRY_OPRGB, "opRGB" }, + /* DP MSA Colorimetry */ + { DP_COLORIMETRY_Y_CBCR_ITU_601, "YCBCR_ITU_601" }, + { DP_COLORIMETRY_Y_CBCR_ITU_709, "YCBCR_ITU_709" }, + { DP_COLORIMETRY_SRGB, "sRGB" }, + { DP_COLORIMETRY_RGB_WIDE_GAMUT, "RGB Wide Gamut" }, + { DP_COLORIMETRY_SCRGB, "scRGB" }, + { DP_COLORIMETRY_DCI_P3, "DCI-P3" }, + { DP_COLORIMETRY_CUSTOM_COLOR_PROFILE, "Custom Profile" }, +}; + + /** * DOC: standard connector properties * @@ -1454,6 +1477,14 @@ int drm_mode_create_colorspace_property(struct drm_connector *connector) ARRAY_SIZE(hdmi_colorspace)); if (!prop) return -ENOMEM; + } else if (connector->connector_type == DRM_MODE_CONNECTOR_eDP || + connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) { + + prop = drm_property_create_enum(dev, DRM_MODE_PROP_ENUM, + "Colorspace", dp_colorspace, + ARRAY_SIZE(dp_colorspace)); + if (!prop) + return -ENOMEM; }
connector->colorspace_property = prop;
Hi Uma,
On Tue, Nov 27, 2018 at 10:10:42PM +0530, Uma Shankar wrote:
This patch adds a DP colorspace property, enabling userspace to switch to various supported colorspaces. This will help enable BT2020 along with other colorspaces.
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: 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.
Signed-off-by: Uma Shankar uma.shankar@intel.com
drivers/gpu/drm/drm_connector.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 57d36e4..30e2e6f 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -850,6 +850,29 @@ int drm_display_info_set_bus_formats(struct drm_display_info *info, { COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" }, };
+static const struct drm_prop_enum_list dp_colorspace[] = {
- /* For Default case, driver will set the colorspace */
- { COLORIMETRY_DEFAULT, "Default" },
- /* Standard Definition Colorimetry based on CEA 861 */
- { COLORIMETRY_ITU_601, "ITU_601" },
- { COLORIMETRY_ITU_709, "ITU_709" },
- /* Standard Definition Colorimetry based on IEC 61966-2-4 */
- { COLORIMETRY_XV_YCC_601, "XV_YCC_601" },
- /* High Definition Colorimetry based on IEC 61966-2-4 */
- { COLORIMETRY_XV_YCC_709, "XV_YCC_709" },
- /* Colorimetry based on IEC 61966-2-5 */
- { COLORIMETRY_OPRGB, "opRGB" },
A macro for the common ones might be good to ensure they always stay in-sync between HDMI and DP
Thanks, -Brian
- /* DP MSA Colorimetry */
- { DP_COLORIMETRY_Y_CBCR_ITU_601, "YCBCR_ITU_601" },
- { DP_COLORIMETRY_Y_CBCR_ITU_709, "YCBCR_ITU_709" },
- { DP_COLORIMETRY_SRGB, "sRGB" },
- { DP_COLORIMETRY_RGB_WIDE_GAMUT, "RGB Wide Gamut" },
- { DP_COLORIMETRY_SCRGB, "scRGB" },
- { DP_COLORIMETRY_DCI_P3, "DCI-P3" },
- { DP_COLORIMETRY_CUSTOM_COLOR_PROFILE, "Custom Profile" },
+};
/**
- DOC: standard connector properties
@@ -1454,6 +1477,14 @@ int drm_mode_create_colorspace_property(struct drm_connector *connector) ARRAY_SIZE(hdmi_colorspace)); if (!prop) return -ENOMEM;
} else if (connector->connector_type == DRM_MODE_CONNECTOR_eDP ||
connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) {prop = drm_property_create_enum(dev, DRM_MODE_PROP_ENUM,"Colorspace", dp_colorspace,ARRAY_SIZE(dp_colorspace));if (!prop)return -ENOMEM;}
connector->colorspace_property = prop;
-- 1.9.1
-----Original Message----- From: Brian Starkey [mailto:Brian.Starkey@arm.com] Sent: Wednesday, November 28, 2018 5:12 PM To: Shankar, Uma uma.shankar@intel.com Cc: intel-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; Lankhorst, Maarten maarten.lankhorst@intel.com; Syrjala, Ville ville.syrjala@intel.com; Sharma, Shashank shashank.sharma@intel.com; jonas@kwiboo.se; hansverk@cisco.com; nd nd@arm.com Subject: Re: [v4 2/3] drm: Add DP colorspace property
Hi Uma,
On Tue, Nov 27, 2018 at 10:10:42PM +0530, Uma Shankar wrote:
This patch adds a DP colorspace property, enabling userspace to switch to various supported colorspaces. This will help enable BT2020 along with other colorspaces.
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: 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.
Signed-off-by: Uma Shankar uma.shankar@intel.com
drivers/gpu/drm/drm_connector.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 57d36e4..30e2e6f 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -850,6 +850,29 @@ int drm_display_info_set_bus_formats(struct
drm_display_info *info,
{ COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" }, };
+static const struct drm_prop_enum_list dp_colorspace[] = {
- /* For Default case, driver will set the colorspace */
- { COLORIMETRY_DEFAULT, "Default" },
- /* Standard Definition Colorimetry based on CEA 861 */
- { COLORIMETRY_ITU_601, "ITU_601" },
- { COLORIMETRY_ITU_709, "ITU_709" },
- /* Standard Definition Colorimetry based on IEC 61966-2-4 */
- { COLORIMETRY_XV_YCC_601, "XV_YCC_601" },
- /* High Definition Colorimetry based on IEC 61966-2-4 */
- { COLORIMETRY_XV_YCC_709, "XV_YCC_709" },
- /* Colorimetry based on IEC 61966-2-5 */
- { COLORIMETRY_OPRGB, "opRGB" },
A macro for the common ones might be good to ensure they always stay in-sync between HDMI and DP
Yes, I can make that. Will update it.
Thanks & Regards, Uma Shankar
Thanks, -Brian
- /* DP MSA Colorimetry */
- { DP_COLORIMETRY_Y_CBCR_ITU_601, "YCBCR_ITU_601" },
- { DP_COLORIMETRY_Y_CBCR_ITU_709, "YCBCR_ITU_709" },
- { DP_COLORIMETRY_SRGB, "sRGB" },
- { DP_COLORIMETRY_RGB_WIDE_GAMUT, "RGB Wide Gamut" },
- { DP_COLORIMETRY_SCRGB, "scRGB" },
- { DP_COLORIMETRY_DCI_P3, "DCI-P3" },
- { DP_COLORIMETRY_CUSTOM_COLOR_PROFILE, "Custom Profile" }, };
/**
- DOC: standard connector properties
@@ -1454,6 +1477,14 @@ int drm_mode_create_colorspace_property(struct
drm_connector *connector)
ARRAY_SIZE(hdmi_colorspace)); if (!prop) return -ENOMEM;
- } else if (connector->connector_type == DRM_MODE_CONNECTOR_eDP
||
connector->connector_type ==DRM_MODE_CONNECTOR_DisplayPort) {
prop = drm_property_create_enum(dev,DRM_MODE_PROP_ENUM,
"Colorspace", dp_colorspace,ARRAY_SIZE(dp_colorspace));if (!prop)return -ENOMEM;}
connector->colorspace_property = prop;
-- 1.9.1
Regards
Shashank
On 11/27/2018 10:10 PM, Uma Shankar wrote:
This patch adds a DP colorspace property, enabling userspace to switch to various supported colorspaces. This will help enable BT2020 along with other colorspaces.
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: 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.
Signed-off-by: Uma Shankar uma.shankar@intel.com
drivers/gpu/drm/drm_connector.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 57d36e4..30e2e6f 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -850,6 +850,29 @@ int drm_display_info_set_bus_formats(struct drm_display_info *info, { COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" }, };
+static const struct drm_prop_enum_list dp_colorspace[] = {
- /* For Default case, driver will set the colorspace */
- { COLORIMETRY_DEFAULT, "Default" },
- /* Standard Definition Colorimetry based on CEA 861 */
- { COLORIMETRY_ITU_601, "ITU_601" },
- { COLORIMETRY_ITU_709, "ITU_709" },
- /* Standard Definition Colorimetry based on IEC 61966-2-4 */
- { COLORIMETRY_XV_YCC_601, "XV_YCC_601" },
- /* High Definition Colorimetry based on IEC 61966-2-4 */
- { COLORIMETRY_XV_YCC_709, "XV_YCC_709" },
- /* Colorimetry based on IEC 61966-2-5 */
- { COLORIMETRY_OPRGB, "opRGB" },
- /* DP MSA Colorimetry */
- { DP_COLORIMETRY_Y_CBCR_ITU_601, "YCBCR_ITU_601" },
- { DP_COLORIMETRY_Y_CBCR_ITU_709, "YCBCR_ITU_709" },
- { DP_COLORIMETRY_SRGB, "sRGB" },
- { DP_COLORIMETRY_RGB_WIDE_GAMUT, "RGB Wide Gamut" },
- { DP_COLORIMETRY_SCRGB, "scRGB" },
- { DP_COLORIMETRY_DCI_P3, "DCI-P3" },
- { DP_COLORIMETRY_CUSTOM_COLOR_PROFILE, "Custom Profile" },
+};
The same comments as previous patch, possibility of the platform specfic enum values being passed from the core driver. and DRM layer blindly registers it. - Shashank
/**
- DOC: standard connector properties
@@ -1454,6 +1477,14 @@ int drm_mode_create_colorspace_property(struct drm_connector *connector) ARRAY_SIZE(hdmi_colorspace)); if (!prop) return -ENOMEM;
} else if (connector->connector_type == DRM_MODE_CONNECTOR_eDP ||
connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) {prop = drm_property_create_enum(dev, DRM_MODE_PROP_ENUM,"Colorspace", dp_colorspace,ARRAY_SIZE(dp_colorspace));if (!prop)return -ENOMEM;}
connector->colorspace_property = prop;
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.
Signed-off-by: Uma Shankar uma.shankar@intel.com --- drivers/gpu/drm/i915/intel_atomic.c | 1 + drivers/gpu/drm/i915/intel_connector.c | 8 ++++++++ drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_hdmi.c | 18 ++++++++++++++++++ 4 files changed, 28 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c index a5a2c8f..35ef70a 100644 --- a/drivers/gpu/drm/i915/intel_atomic.c +++ b/drivers/gpu/drm/i915/intel_atomic.c @@ -125,6 +125,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) diff --git a/drivers/gpu/drm/i915/intel_connector.c b/drivers/gpu/drm/i915/intel_connector.c index 18e370f..65e9152 100644 --- a/drivers/gpu/drm/i915/intel_connector.c +++ b/drivers/gpu/drm/i915/intel_connector.c @@ -262,3 +262,11 @@ 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) +{ + if (!drm_mode_create_colorspace_property(connector)) + drm_object_attach_property(&connector->base, + connector->colorspace_property, 0); +} diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index a62d77b..891bc82 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1762,6 +1762,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 *); diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index e2c6a2b..7ddc723 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -486,6 +486,22 @@ static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder, else frame.avi.colorspace = HDMI_COLORSPACE_RGB;
+ if (conn_state->colorspace == COLORIMETRY_DEFAULT) { + /* Set ITU 709 as default for HDMI */ + frame.avi.colorimetry = COLORIMETRY_ITU_709; + } else if (conn_state->colorspace < 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. + */ + frame.avi.extended_colorimetry = conn_state->colorspace - + COLORIMETRY_XV_YCC_601; + } + drm_hdmi_avi_infoframe_quant_range(&frame.avi, adjusted_mode, crtc_state->limited_color_range ? HDMI_QUANTIZATION_RANGE_LIMITED : @@ -2135,6 +2151,8 @@ static void intel_hdmi_destroy(struct drm_connector *connector) intel_attach_force_audio_property(connector); intel_attach_broadcast_rgb_property(connector); intel_attach_aspect_ratio_property(connector); + intel_attach_colorspace_property(connector); + drm_connector_attach_content_type_property(connector); connector->state->picture_aspect_ratio = HDMI_PICTURE_ASPECT_NONE;
Hi Uma,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on drm-intel/for-linux-next] [also build test WARNING on next-20181128] [cannot apply to v4.20-rc4] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Uma-Shankar/Add-Colorspace-connecto... base: git://anongit.freedesktop.org/drm-intel for-linux-next config: x86_64-allmodconfig (attached as .config) compiler: gcc-7 (Debian 7.3.0-1) 7.3.0 reproduce: # save the attached .config to linux build tree make ARCH=x86_64
All warnings (new ones prefixed by >>):
drivers/gpu/drm/i915/intel_hdmi.c:493:51: warning: mixing different enum types
drivers/gpu/drm/i915/intel_hdmi.c:493:51: unsigned int enum absolute_colorimetry_list versus drivers/gpu/drm/i915/intel_hdmi.c:493:51: unsigned int enum hdmi_colorimetry include/linux/slab.h:332:43: warning: dubious: x & !y include/linux/slab.h:332:43: warning: dubious: x & !y
vim +493 drivers/gpu/drm/i915/intel_hdmi.c
460 461 static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder, 462 const struct intel_crtc_state *crtc_state, 463 const struct drm_connector_state *conn_state) 464 { 465 struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base); 466 const struct drm_display_mode *adjusted_mode = 467 &crtc_state->base.adjusted_mode; 468 struct drm_connector *connector = &intel_hdmi->attached_connector->base; 469 bool is_hdmi2_sink = connector->display_info.hdmi.scdc.supported || 470 connector->display_info.color_formats & DRM_COLOR_FORMAT_YCRCB420; 471 union hdmi_infoframe frame; 472 int ret; 473 474 ret = drm_hdmi_avi_infoframe_from_display_mode(&frame.avi, 475 adjusted_mode, 476 is_hdmi2_sink); 477 if (ret < 0) { 478 DRM_ERROR("couldn't fill AVI infoframe\n"); 479 return; 480 } 481 482 if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR420) 483 frame.avi.colorspace = HDMI_COLORSPACE_YUV420; 484 else if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR444) 485 frame.avi.colorspace = HDMI_COLORSPACE_YUV444; 486 else 487 frame.avi.colorspace = HDMI_COLORSPACE_RGB; 488 489 if (conn_state->colorspace == COLORIMETRY_DEFAULT) { 490 /* Set ITU 709 as default for HDMI */ 491 frame.avi.colorimetry = COLORIMETRY_ITU_709; 492 } else if (conn_state->colorspace < COLORIMETRY_XV_YCC_601) {
493 frame.avi.colorimetry = conn_state->colorspace;
494 } else { 495 frame.avi.colorimetry = HDMI_COLORIMETRY_EXTENDED; 496 /* 497 * Starting from extended list where COLORIMETRY_XV_YCC_601 498 * is the first extended mode and its value is 0 as per HDMI 499 * specification. 500 */ 501 frame.avi.extended_colorimetry = conn_state->colorspace - 502 COLORIMETRY_XV_YCC_601; 503 } 504 505 drm_hdmi_avi_infoframe_quant_range(&frame.avi, adjusted_mode, 506 crtc_state->limited_color_range ? 507 HDMI_QUANTIZATION_RANGE_LIMITED : 508 HDMI_QUANTIZATION_RANGE_FULL, 509 intel_hdmi->rgb_quant_range_selectable, 510 is_hdmi2_sink); 511 512 drm_hdmi_avi_infoframe_content_type(&frame.avi, 513 conn_state); 514 515 /* TODO: handle pixel repetition for YCBCR420 outputs */ 516 intel_write_infoframe(encoder, crtc_state, 517 &frame); 518 } 519
--- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation
Hi,
On Tue, Nov 27, 2018 at 10:10:40PM +0530, Uma Shankar wrote:
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. Kernel will not give the supported colorspaces since this is panel dependent and our current property infrastructure is not supporting it.
So is the problem here that we've no way to change the supported enum values at runtime? Conceptually, do you think there's a problem with the kernel only exposing the colorspaces that the sink supports (if that were possible)? I'm wondering if changing the current property infrastructure is better than punting the job to userspace to decode the EDID.
Have tested this using xrandr by using below command: xrandr --output HDMI2 --set "Colorspace" "BT2020_rgb"
It would also be really great to get some more comprehensive documentation about how this property is meant to be used. Is the expectation that userspace does everything? i.e.:
- Userspace sets up CRTC DEGAMMA/CTM/GAMMA to convert to some sink colorspace - Userspace sets this new property to let the sink know what it converted the CRTC output to.
Or in other words, I think this new property has zero impact on any pixel processing in the pipeline - it only sets the colorspace in the infoframe. That seems very valuable to write down explicitly.
BTW, is there already a standard property for converting CRTC output to YCbCr? And does that interact with picking the YCC colorimetries with this property?
Cheers, -Brian
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 based on the colorspaces supported by the respective protocol standard. Handled the default case more efficiently.
Uma Shankar (3): drm: Add HDMI colorspace property drm: Add DP colorspace property drm/i915: Attach colorspace property and enable modeset
drivers/gpu/drm/drm_atomic_uapi.c | 4 ++ drivers/gpu/drm/drm_connector.c | 92 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_atomic.c | 1 + drivers/gpu/drm/i915/intel_connector.c | 8 +++ drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_hdmi.c | 18 +++++++ include/drm/drm_connector.h | 14 ++++++ include/uapi/drm/drm_mode.h | 33 ++++++++++++ 8 files changed, 171 insertions(+)
-- 1.9.1
-----Original Message----- From: dri-devel [mailto:dri-devel-bounces@lists.freedesktop.org] On Behalf Of Brian Starkey Sent: Wednesday, November 28, 2018 5:27 PM To: Shankar, Uma uma.shankar@intel.com Cc: Syrjala, Ville ville.syrjala@intel.com; jonas@kwiboo.se; intel- gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; hansverk@cisco.com; nd nd@arm.com; Lankhorst, Maarten maarten.lankhorst@intel.com Subject: Re: [v4 0/3] Add Colorspace connector property interface
Hi,
On Tue, Nov 27, 2018 at 10:10:40PM +0530, Uma Shankar wrote:
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. Kernel will not give the supported colorspaces since this is panel dependent and our current property infrastructure is not supporting it.
So is the problem here that we've no way to change the supported enum values at runtime? Conceptually, do you think there's a problem with the kernel only exposing the colorspaces that the sink supports (if that were possible)? I'm wondering if changing the current property infrastructure is better than punting the job to userspace to decode the EDID.
Only problem which I see is that all the connector properties are created at connector initialization including the connector->edid property. The respective sync devices may not be attached also at that moment. There is an option to change the blob id's for case of edid when new sink is plugged in, but the fundamental structure remains same. I mean the enum which is used at creating the colorspace enum property can't be changed at runtime. It stays the same throughout the drivers life (this is of course based on my understanding :), correct me I am wrong). Hence changing it based on sink is not easy with the current design.
Have tested this using xrandr by using below command: xrandr --output HDMI2 --set "Colorspace" "BT2020_rgb"
It would also be really great to get some more comprehensive documentation about how this property is meant to be used. Is the expectation that userspace does everything? i.e.:
- Userspace sets up CRTC DEGAMMA/CTM/GAMMA to convert to some sink colorspace
- Userspace sets this new property to let the sink know what it converted the CRTC output to.
Or in other words, I think this new property has zero impact on any pixel processing in the pipeline - it only sets the colorspace in the infoframe. That seems very valuable to write down explicitly.
Yes, this is what this property does. Userspace decides the blending and colorspace target for blending output from pipe. This helps to pass that info to sink device which was missing till now. I will update it and add documentation on the same to be clear wrt property expectation and purpose.
BTW, is there already a standard property for converting CRTC output to YCbCr? And does that interact with picking the YCC colorimetries with this property?
AFAIK, there is no dedicated property but the YUV modes are added as part of HDMI 2.0 development work from Shashank. User can set the mode and driver will do the conversion internally if the hardware supports it, else it may choose to drop the mode.
Regards, Uma Shankar
Cheers, -Brian
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 based on the colorspaces supported by the respective protocol standard. Handled the default case more efficiently.
Uma Shankar (3): drm: Add HDMI colorspace property drm: Add DP colorspace property drm/i915: Attach colorspace property and enable modeset
drivers/gpu/drm/drm_atomic_uapi.c | 4 ++ drivers/gpu/drm/drm_connector.c | 92
++++++++++++++++++++++++++++++++++
drivers/gpu/drm/i915/intel_atomic.c | 1 + drivers/gpu/drm/i915/intel_connector.c | 8 +++ drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_hdmi.c | 18 +++++++ include/drm/drm_connector.h | 14 ++++++ include/uapi/drm/drm_mode.h | 33 ++++++++++++ 8 files changed, 171 insertions(+)
-- 1.9.1
dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
On Wed, Nov 28, 2018 at 02:29:53PM +0000, Shankar, Uma wrote:
-----Original Message----- From: dri-devel [mailto:dri-devel-bounces@lists.freedesktop.org] On Behalf Of Brian Starkey Sent: Wednesday, November 28, 2018 5:27 PM To: Shankar, Uma uma.shankar@intel.com Cc: Syrjala, Ville ville.syrjala@intel.com; jonas@kwiboo.se; intel- gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; hansverk@cisco.com; nd nd@arm.com; Lankhorst, Maarten maarten.lankhorst@intel.com Subject: Re: [v4 0/3] Add Colorspace connector property interface
Hi,
On Tue, Nov 27, 2018 at 10:10:40PM +0530, Uma Shankar wrote:
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. Kernel will not give the supported colorspaces since this is panel dependent and our current property infrastructure is not supporting it.
So is the problem here that we've no way to change the supported enum values at runtime? Conceptually, do you think there's a problem with the kernel only exposing the colorspaces that the sink supports (if that were possible)? I'm wondering if changing the current property infrastructure is better than punting the job to userspace to decode the EDID.
Only problem which I see is that all the connector properties are created at connector initialization including the connector->edid property. The respective sync devices may not be attached also at that moment. There is an option to change the blob id's for case of edid when new sink is plugged in, but the fundamental structure remains same. I mean the enum which is used at creating the colorspace enum property can't be changed at runtime. It stays the same throughout the drivers life (this is of course based on my understanding :), correct me I am wrong). Hence changing it based on sink is not easy with the current design.
My understanding is the same. Did you look at what would be needed in order to change the enum property code to support changing the values at runtime? We do already have things which change (e.g. link status), just not enums.
Have tested this using xrandr by using below command: xrandr --output HDMI2 --set "Colorspace" "BT2020_rgb"
It would also be really great to get some more comprehensive documentation about how this property is meant to be used. Is the expectation that userspace does everything? i.e.:
- Userspace sets up CRTC DEGAMMA/CTM/GAMMA to convert to some sink colorspace
- Userspace sets this new property to let the sink know what it converted the CRTC output to.
Or in other words, I think this new property has zero impact on any pixel processing in the pipeline - it only sets the colorspace in the infoframe. That seems very valuable to write down explicitly.
Yes, this is what this property does. Userspace decides the blending and colorspace target for blending output from pipe. This helps to pass that info to sink device which was missing till now. I will update it and add documentation on the same to be clear wrt property expectation and purpose.
BTW, is there already a standard property for converting CRTC output to YCbCr? And does that interact with picking the YCC colorimetries with this property?
AFAIK, there is no dedicated property but the YUV modes are added as part of HDMI 2.0 development work from Shashank. User can set the mode and driver will do the conversion internally if the hardware supports it, else it may choose to drop the mode.
Thanks, I'll go take a look at that.
-Brian
Regards, Uma Shankar
Cheers, -Brian
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 based on the colorspaces supported by the respective protocol standard. Handled the default case more efficiently.
Uma Shankar (3): drm: Add HDMI colorspace property drm: Add DP colorspace property drm/i915: Attach colorspace property and enable modeset
drivers/gpu/drm/drm_atomic_uapi.c | 4 ++ drivers/gpu/drm/drm_connector.c | 92
++++++++++++++++++++++++++++++++++
drivers/gpu/drm/i915/intel_atomic.c | 1 + drivers/gpu/drm/i915/intel_connector.c | 8 +++ drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_hdmi.c | 18 +++++++ include/drm/drm_connector.h | 14 ++++++ include/uapi/drm/drm_mode.h | 33 ++++++++++++ 8 files changed, 171 insertions(+)
-- 1.9.1
dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
-----Original Message----- From: dri-devel [mailto:dri-devel-bounces@lists.freedesktop.org] On Behalf Of Brian Starkey Sent: Wednesday, November 28, 2018 8:17 PM To: Shankar, Uma uma.shankar@intel.com Cc: Syrjala, Ville ville.syrjala@intel.com; jonas@kwiboo.se; intel- gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; hansverk@cisco.com; nd nd@arm.com; Lankhorst, Maarten maarten.lankhorst@intel.com Subject: Re: [v4 0/3] Add Colorspace connector property interface
On Wed, Nov 28, 2018 at 02:29:53PM +0000, Shankar, Uma wrote:
-----Original Message----- From: dri-devel [mailto:dri-devel-bounces@lists.freedesktop.org] On Behalf Of Brian Starkey Sent: Wednesday, November 28, 2018 5:27 PM To: Shankar, Uma uma.shankar@intel.com Cc: Syrjala, Ville ville.syrjala@intel.com; jonas@kwiboo.se; intel- gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; hansverk@cisco.com; nd nd@arm.com; Lankhorst, Maarten maarten.lankhorst@intel.com Subject: Re: [v4 0/3] Add Colorspace connector property interface
Hi,
On Tue, Nov 27, 2018 at 10:10:40PM +0530, Uma Shankar wrote:
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. Kernel will not give the supported colorspaces since this is panel dependent and our current property infrastructure is not supporting it.
So is the problem here that we've no way to change the supported enum values at runtime? Conceptually, do you think there's a problem with the kernel only exposing the colorspaces that the sink supports (if that were possible)? I'm wondering if changing the current property infrastructure is better than punting the job to userspace to decode the EDID.
Only problem which I see is that all the connector properties are created at connector initialization including the connector->edid property. The respective sync devices may not be attached also at that moment. There is an option to change the blob id's for case of edid when new sink is plugged in, but the fundamental structure remains same. I mean the enum which is used at creating the colorspace enum property
can't be changed at runtime. It stays the same throughout the drivers life (this is of course based on my understanding :), correct me I am wrong).
Hence changing it based on sink is not easy with the current design.
My understanding is the same. Did you look at what would be needed in order to change the enum property code to support changing the values at runtime? We do already have things which change (e.g. link status), just not enums.
Link Status also has a fixed enum static const struct drm_prop_enum_list drm_link_status_enum_list[] = { { DRM_MODE_LINK_STATUS_GOOD, "Good" }, { DRM_MODE_LINK_STATUS_BAD, "Bad" }, };
Not sure if we can change this enum at runtime.
Regards, Uma Shankar
Have tested this using xrandr by using below command: xrandr --output HDMI2 --set "Colorspace" "BT2020_rgb"
It would also be really great to get some more comprehensive documentation about how this property is meant to be used. Is the expectation that userspace does everything? i.e.:
- Userspace sets up CRTC DEGAMMA/CTM/GAMMA to convert to some sink colorspace
- Userspace sets this new property to let the sink know what it converted the CRTC output to.
Or in other words, I think this new property has zero impact on any pixel processing in the pipeline - it only sets the colorspace in the infoframe. That seems very valuable to write down explicitly.
Yes, this is what this property does. Userspace decides the blending and colorspace target for blending output from pipe. This helps to pass that info to sink device which was missing till now. I will update it and add documentation on the same to be clear wrt property
expectation and purpose.
BTW, is there already a standard property for converting CRTC output to
YCbCr?
And does that interact with picking the YCC colorimetries with this property?
AFAIK, there is no dedicated property but the YUV modes are added as part of HDMI 2.0 development work from Shashank. User can set the mode and driver will do the conversion internally if the hardware supports it, else it
may choose to drop the mode.
Thanks, I'll go take a look at that.
-Brian
Regards, Uma Shankar
Cheers, -Brian
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 based on the colorspaces supported by the respective protocol standard. Handled the default case more efficiently.
Uma Shankar (3): drm: Add HDMI colorspace property drm: Add DP colorspace property drm/i915: Attach colorspace property and enable modeset
drivers/gpu/drm/drm_atomic_uapi.c | 4 ++ drivers/gpu/drm/drm_connector.c | 92
++++++++++++++++++++++++++++++++++
drivers/gpu/drm/i915/intel_atomic.c | 1 + drivers/gpu/drm/i915/intel_connector.c | 8 +++ drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_hdmi.c | 18 +++++++ include/drm/drm_connector.h | 14 ++++++ include/uapi/drm/drm_mode.h | 33 ++++++++++++ 8 files changed, 171 insertions(+)
-- 1.9.1
dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
dri-devel@lists.freedesktop.org
-
Brian Starkey -
kbuild test robot -
Shankar, Uma -
Sharma, Shashank -
Uma Shankar