Add Colorspace connector property interface
Subsystems (3)
v4 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. 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(+)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 1/3 drm: Add HDMI colorspace property
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.
--- 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(+)
drivers/gpu/drm/drm_atomic_uapi.c +4 -0
@@ -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) {
drivers/gpu/drm/drm_connector.c +61 -0
73 lines not on this page · raw message
include/drm/drm_connector.h +14 -0
@@ -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);
include/uapi/drm/drm_mode.h +33 -0
@@ -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;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
kbuild test robot
build botRe: [v4 1/3] drm: Add HDMI colorspace property
Thank you for the patch! Perhaps something to improve:
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-connector-property-interface/20181128-083317 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
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [v4 1/3] drm: Add HDMI colorspace property
In reply to Uma ShankarRegards
Shashank
Quoted 70 lines · Uma Shankar
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 <[email protected]>--- 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(+)drivers/gpu/drm/drm_atomic_uapi.c +4
-0@@ -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) {drivers/gpu/drm/drm_connector.c +12
-0@@ -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" },
drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct drm_display_info *info, · line 850
Quoted 10 lines
drivers/gpu/drm/drm_connector.c +10
-0+/* 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
Quoted 122 lines
drivers/gpu/drm/drm_connector.c +39
-0+}; +/** * 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 * include/drm/drm_connector.h +14
-0@@ -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);include/uapi/drm/drm_mode.h +26
-0@@ -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 ,
include/uapi/drm/drm_mode.h line 248
Quoted 10 lines
include/uapi/drm/drm_mode.h +7
-0+ 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;
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [v4 1/3] drm: Add HDMI colorspace property
Quoted 109 lines
-----Original Message-----
From: Sharma, Shashank
Sent: Wednesday, November 28, 2018 9:41 PM
To: Shankar, Uma <[email protected]>; [email protected]; [email protected]
Cc: Lankhorst, Maarten <[email protected]>; Syrjala, Ville <[email protected]>; [email protected]; [email protected]; [email protected]
Subject: Re: [v4 1/3] drm: Add HDMI colorspace propertyRegards
Shashank
Quoted 15 lines · Uma Shankar
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.
Quoted 8 lines
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 <[email protected]>--- drivers/gpu/drm/drm_atomic_uapi.c | 4 +++ drivers/gpu/drm/drm_connector.c | 61+++++++++++++++++++++++++++++++++++++++
drivers/gpu/drm/drm_atomic_uapi.c static int drm_atomic_connector_set_property(struct
Quoted 10 lines
include/drm/drm_connector.h | 14 +++++++++ include/uapi/drm/drm_mode.h | 33 +++++++++++++++++++++ 4 files changed, 112 insertions(+)drivers/gpu/drm/drm_atomic_uapi.c +0
-0@@ -729,6 +729,8 @@ static int drm_atomic_connector_set_property(struct
drm_connector*connector,drivers/gpu/drm/drm_atomic_uapi.c static int drm_atomic_connector_set_property(struct drm_connector *connector,
Quoted 7 lines
drivers/gpu/drm/drm_atomic_uapi.c +2
-0return -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);
drivers/gpu/drm/drm_atomic_uapi.c static int drm_atomic_connector_set_property(struct · line 736
Quoted 1 line
drivers/gpu/drm/drm_atomic_uapi.c +0
-0int ret = drm_atomic_set_writeback_fb_for_connector(state,fb); @@
Quoted 1 line
-797,6 +799,8 @@ static int drm_atomic_connector_set_property(struct
drm_connector*connector,drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct
Quoted 13 lines
*val = state->picture_aspect_ratio; } else if (property == config->content_type_property) { *val = state->content_type;drivers/gpu/drm/drm_atomic_uapi.c +2
-0+ }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) {(quoted diff) +0
-0
b/drivers/gpu/drm/drm_connector.cindex fa9baac..57d36e4 100644drivers/gpu/drm/drm_connector.c +0
-0@@ -826,6 +826,30 @@ int drm_display_info_set_bus_formats(struct
drm_display_info*info,drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct · line 827
Quoted 2 lines
drivers/gpu/drm/drm_connector.c +0
-0}; DRM_ENUM_NAME_FN(drm_get_content_protection_name,
drm_cp_enum_list)Quoted 13 lines
drivers/gpu/drm/drm_connector.c +12
-0+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" },drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct drm_display_info *info, · line 850
Quoted 10 lines
drivers/gpu/drm/drm_connector.c +10
-0+/* 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.
Quoted 10 lines
How about we modify the design a drm helper bit like this:
1. Keep theabsolute_colorimetry_listas 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 (likeintel_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 addREC_2020etc)
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
Quoted 134 lines
- Shashank
drivers/gpu/drm/drm_connector.c int drm_mode_create_aspect_ratio_property(struct
Quoted 6 lines
drivers/gpu/drm/drm_connector.c +2
-0+}; +/** * DOC: standard connector properties * @@ -1402,6 +1426,43 @@ int drm_mode_create_aspect_ratio_property(struct
drm_device*dev)Quoted 15 lines
drivers/gpu/drm/drm_connector.c +12
-0EXPORT_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. +* drivers/gpu/drm/drm_connector.c int drm_mode_create_aspect_ratio_property(struct drm_device *dev)
Quoted 10 lines
drivers/gpu/drm/drm_connector.c +10
-0+* 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) {drivers/gpu/drm/drm_connector.c int drm_mode_create_aspect_ratio_property(struct · line 1452
Quoted 2 lines
drivers/gpu/drm/drm_connector.c +2
-0+ + prop = drm_property_create_enum(dev,
DRM_MODE_PROP_ENUM,Quoted 48 lines
drivers/gpu/drm/drm_connector.c +14
-0+"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 * include/drm/drm_connector.h +7
-0@@ -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{
structdrm_property*content_protection_property;/**
include/drm/drm_connector.h +6
-0+* @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 Quoted 1 line
only @@ -1248,6 +1261,7 @@ int
drm_connector_attach_scaling_mode_property(struct
drm_connector*connector,include/drm/drm_connector.h
Quoted 7 lines
int drm_connector_attach_content_protection_property( struct drm_connector *connector); int drm_mode_create_aspect_ratio_property(struct drm_device *dev);include/drm/drm_connector.h +2
-0+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,
Quoted 1 line
const struct
drm_connector_state
*conn_state); diff --gitQuoted 36 lines
a/include/uapi/drm/drm_mode.hb/include/uapi/drm/drm_mode.hindex d3e0fe3..42efab8 100644include/uapi/drm/drm_mode.h +28
-0@@ -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 ,
Quoted 8 lines
include/uapi/drm/drm_mode.h line 248
Quoted 8 lines
include/uapi/drm/drm_mode.h +5
-0+ DP_COLORIMETRY_SCRGB, +DP_COLORIMETRY_DCI_P3 , + DP_COLORIMETRY_CUSTOM_COLOR_PROFILE, +}; +struct drm_mode_modeinfo {__u32 clock;__u16 hdisplay;
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 2/3 drm: Add DP colorspace property
In reply to Uma ShankarThis 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.
--- drivers/gpu/drm/drm_connector.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
drivers/gpu/drm/drm_connector.c +31 -0
@@ -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;
Signature · 6 lines
1.9.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [v4 2/3] drm: Add DP colorspace property
Hi Uma,
Quoted 31 lines · Uma Shankar
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 <[email protected]>--- drivers/gpu/drm/drm_connector.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)drivers/gpu/drm/drm_connector.c +2
-0@@ -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 */
drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct drm_display_info *info, · line 864
Quoted 10 lines
drivers/gpu/drm/drm_connector.c +10
-0+ { 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
Quoted 32 lines
drivers/gpu/drm/drm_connector.c +19
-0+/* 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;Signature · 1 line
1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [v4 2/3] drm: Add DP colorspace property
Quoted 43 lines
-----Original Message-----
From: Brian Starkey [mailto:[email protected]]
Sent: Wednesday, November 28, 2018 5:12 PM
To: Shankar, Uma <[email protected]>
Cc: [email protected]; [email protected]; Lankhorst, Maarten <[email protected]>; Syrjala, Ville <[email protected]>; Sharma, Shashank <[email protected]>; [email protected]; [email protected]; nd <[email protected]>
Subject: Re: [v4 2/3] drm: Add DP colorspace propertyHi Uma,
drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct
Quoted 25 lines · Uma Shankar
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 <[email protected]>--- drivers/gpu/drm/drm_connector.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)(quoted diff) +0
-0
b/drivers/gpu/drm/drm_connector.cindex 57d36e4..30e2e6f 100644drivers/gpu/drm/drm_connector.c +0
-0@@ -850,6 +850,29 @@ int drm_display_info_set_bus_formats(struct
drm_display_info*info,Quoted 2 lines
drivers/gpu/drm/drm_connector.c +0
-0{ COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" }, };
Quoted 15 lines
drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct drm_display_info *info, · line 864
Quoted 12 lines
drivers/gpu/drm/drm_connector.c +12
-0+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
Quoted 34 lines
Thanks,
-Briandrivers/gpu/drm/drm_connector.c int drm_mode_create_colorspace_property(struct
Quoted 14 lines
drivers/gpu/drm/drm_connector.c +10
-0+/* 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)drivers/gpu/drm/drm_connector.c int drm_mode_create_colorspace_property(struct drm_connector *connector)
Quoted 4 lines
drivers/gpu/drm/drm_connector.c +1
-0ARRAY_SIZE(hdmi_colorspace));if (!prop)return -ENOMEM ; + } else if (connector->connector_type == DRM_MODE_CONNECTOR_eDP||
drivers/gpu/drm/drm_connector.c int drm_mode_create_colorspace_property(struct · line 1481
Quoted 1 line
drivers/gpu/drm/drm_connector.c +1
-0+ connector->connector_type ==
DRM_MODE_CONNECTOR_DisplayPort) {drivers/gpu/drm/drm_connector.c int drm_mode_create_colorspace_property(struct · line 1483
Quoted 2 lines
drivers/gpu/drm/drm_connector.c +2
-0+ + prop = drm_property_create_enum(dev,
DRM_MODE_PROP_ENUM,Quoted 6 lines
drivers/gpu/drm/drm_connector.c +4
-0+"Colorspace" , dp_colorspace, + ARRAY_SIZE(dp_colorspace)); +if (!prop) +return -ENOMEM ; }
Quoted 4 lines
Quoted 4 lines
drivers/gpu/drm/drm_connector.c +0
-1connector->colorspace_property = prop; --1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [v4 2/3] drm: Add DP colorspace property
In reply to Uma ShankarRegards
Shashank
Quoted 42 lines · Uma Shankar
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 <[email protected]>--- drivers/gpu/drm/drm_connector.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)drivers/gpu/drm/drm_connector.c +13
-0@@ -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 */
drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct drm_display_info *info, · line 875
Quoted 10 lines
drivers/gpu/drm/drm_connector.c +10
-0+ { 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
Quoted 8 lines
drivers/gpu/drm/drm_connector.c +1
-0/** * 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 ||
drivers/gpu/drm/drm_connector.c int drm_mode_create_colorspace_property(struct drm_connector *connector) · line 1490
Quoted 10 lines
drivers/gpu/drm/drm_connector.c +7
-0+ 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;
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 3/3 drm/i915: Attach colorspace property and enable modeset
In reply to Uma ShankarThis 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.
--- 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(+)
drivers/gpu/drm/i915/intel_atomic.c +1 -0
@@ -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)
drivers/gpu/drm/i915/intel_connector.c +8 -0
@@ -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 ); +}
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -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 *);
drivers/gpu/drm/i915/intel_hdmi.c +18 -0
@@ -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 ;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
kbuild test robot
build botRe: [v4 3/3] drm/i915: Attach colorspace property and enable modeset
Thank you for the patch! Perhaps something to improve:
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-connector-property-interface/20181128-083317 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
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for Add Colorspace connector property interface (rev4)
In reply to Uma Shankar== Series Details ==
== Series Details ==
Series: Add Colorspace connector property interface (rev4)
URL : https://patchwork.freedesktop.org/series/47132/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
2722ee46454c drm: Add HDMI colorspace property
-:110: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#110: FILE: drivers/gpu/drm/drm_connector.c:1449:
+ if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
+ connector->connector_type == DRM_MODE_CONNECTOR_HDMIB) {-:111: CHECK:BRACES: Blank lines aren't necessary after an open brace '{' #111: FILE: drivers/gpu/drm/drm_connector.c:1450:
+ connector->connector_type == DRM_MODE_CONNECTOR_HDMIB) {
+
total: 0 errors, 0 warnings, 2 checks, 160 lines checked 775633fa8564 drm: Add DP colorspace property
-:54: CHECK:LINE_SPACING: Please don't use multiple blank lines #54: FILE: drivers/gpu/drm/drm_connector.c:875:
+
+
-:64: CHECK:BRACES: Blank lines aren't necessary after an open brace '{' #64: FILE: drivers/gpu/drm/drm_connector.c:1482:
+ connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) {
+
total: 0 errors, 0 warnings, 2 checks, 43 lines checked fdc1419f5262 drm/i915: Attach colorspace property and enable modeset -:57: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #57: FILE: drivers/gpu/drm/i915/intel_connector.c:271:
+ drm_object_attach_property(&connector->base,
+ connector->colorspace_property, 0);
total: 0 errors, 0 warnings, 1 checks, 55 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for Add Colorspace connector property interface (rev4)
In reply to Uma Shankar== Series Details ==
== Series Details ==
Series: Add Colorspace connector property interface (rev4)
URL : https://patchwork.freedesktop.org/series/47132/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Sparse version: v0.5.2 Commit: drm: Add HDMI colorspace property + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~ + connector->colorspace_property = prop; +drivers/gpu/drm/drm_connector.c:1459:33: warning: ‘prop’ may be used uninitialized in this function [-Wmaybe-uninitialized] +drivers/gpu/drm/drm_connector.c: In function ‘drm_mode_create_colorspace_property’:
Commit: drm: Add DP colorspace property
-O:drivers/gpu/drm/drm_connector.c:1459:33: warning: ‘prop’ may be used uninitialized in this function [-Wmaybe-uninitialized] +drivers/gpu/drm/drm_connector.c:1490:33: warning: ‘prop’ may be used uninitialized in this function [-Wmaybe-uninitialized]
Commit: drm/i915: Attach colorspace property and enable modeset+drivers/gpu/drm/i915/intel_hdmi.c:493:51: int enum absolute_colorimetry_list versus+drivers/gpu/drm/i915/intel_hdmi.c:493:51: int enum hdmi_colorimetry+drivers/gpu/drm/i915/intel_hdmi.c:493:51: warning: mixing different enum types
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Add Colorspace connector property interface (rev4)
In reply to Uma Shankar== Series Details ==
== Series Details ==
Series: Add Colorspace connector property interface (rev4)
URL : https://patchwork.freedesktop.org/series/47132/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_5211 -> Patchwork_10913 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/47132/revisions/4/mbox/
== Known issues ==
Here are the changes found in Patchwork_10913 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_exec_suspend@basic-s4-devices:
fi-ivb-3520m: PASS -> FAIL (fdo#108880)
igt@i915_selftest@live_coherency:
fi-gdg-551: PASS -> DMESG-FAIL (fdo#107164)
igt@i915_selftest@live_execlists:
fi-apl-guc: PASS -> INCOMPLETE (fdo#103927)
igt@kms_frontbuffer_tracking@basic:
{fi-icl-u3}: PASS -> FAIL (fdo#103167)
igt@kms_pipe_crc_basic@hang-read-crc-pipe-b:
fi-byt-clapper: PASS -> FAIL (fdo#107362, fdo#103191) +1
igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a:
fi-byt-clapper: PASS -> FAIL (fdo#107362)
igt@prime_vgem@basic-fence-flip:
fi-gdg-551: PASS -> FAIL (fdo#103182)
==== Possible fixes ====
igt@i915_module_load@reload:
fi-blb-e6850: INCOMPLETE (fdo#107718) -> PASS
igt@i915_selftest@live_hangcheck:
fi-cfl-8109u: INCOMPLETE (fdo#106070) -> PASS
igt@kms_chamelium@hdmi-hpd-fast:
{fi-kbl-7500u}: FAIL -> PASS
igt@kms_frontbuffer_tracking@basic:
fi-hsw-peppy: DMESG-WARN (fdo#102614) -> PASS
igt@kms_pipe_crc_basic@read-crc-pipe-a:
fi-byt-clapper: FAIL (fdo#107362) -> PASS
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
fi-byt-clapper: FAIL (fdo#107362, fdo#103191) -> PASS
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
fi-cfl-8109u: DMESG-WARN (fdo#106107) -> PASS
==== Warnings ====
igt@i915_selftest@live_contexts:
{fi-icl-u3}: DMESG-FAIL (fdo#108569) -> INCOMPLETE (fdo#108315) {name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103182 https://bugs.freedesktop.org/show_bug.cgi?id=103182
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#106070 https://bugs.freedesktop.org/show_bug.cgi?id=106070
fdo#106107 https://bugs.freedesktop.org/show_bug.cgi?id=106107
fdo#107164 https://bugs.freedesktop.org/show_bug.cgi?id=107164
fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
fdo#107718 https://bugs.freedesktop.org/show_bug.cgi?id=107718
fdo#108315 https://bugs.freedesktop.org/show_bug.cgi?id=108315
fdo#108569 https://bugs.freedesktop.org/show_bug.cgi?id=108569
fdo#108880 https://bugs.freedesktop.org/show_bug.cgi?id=108880
== Participating hosts (51 -> 46) ==
Missing (5): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600
== Build changes ==
* Linux: CI_DRM_5211 -> Patchwork_10913
CI_DRM_5211: b6ba4ad91b7c6c4341c40a05b0326470e0c293cb @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4732: eae5c3587e56abc581af9b59060cd316df2caa08 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10913: fdc1419f5262c415fb4e67825e15c30d90e31e6a @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
fdc1419f5262 drm/i915: Attach colorspace property and enable modeset 775633fa8564 drm: Add DP colorspace property2722ee46454c drm: Add HDMI colorspace property
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10913/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: failure for Add Colorspace connector property interface (rev4)
In reply to Uma Shankar== Series Details ==
== Series Details ==
Series: Add Colorspace connector property interface (rev4)
URL : https://patchwork.freedesktop.org/series/47132/
State : failure
== Summary ==
= CI Bug Log - changes from CI_DRM_5211_full -> Patchwork_10913_full =
== Summary - FAILURE ==
Serious unknown changes coming with Patchwork_10913_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_10913_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_10913_full:
=== IGT changes ===
==== Possible regressions ====
igt@kms_sequence@queue-busy:
shard-skl: NOTRUN -> FAIL
==== Warnings ====
igt@kms_chv_cursor_fail@pipe-b-64x64-top-edge:
shard-snb: SKIP -> PASS
igt@pm_rc6_residency@rc6-accuracy:
shard-kbl: SKIP -> PASS== Known issues ==
Here are the changes found in Patchwork_10913_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drm_import_export@import-close-race-flink:
shard-skl: PASS -> TIMEOUT ([fdo#108667])
igt@gem_exec_reuse@contexts:
shard-apl: PASS -> INCOMPLETE ([fdo#103927])
igt@gem_exec_schedule@pi-ringfull-blt:
shard-skl: NOTRUN -> FAIL ([fdo#103158])
igt@gem_exec_schedule@pi-ringfull-vebox:
{shard-iclb}: NOTRUN -> FAIL ([fdo#103158])
igt@gem_exec_suspend@basic-s3:
shard-kbl: PASS -> INCOMPLETE ([fdo#103665])
igt@gem_ppgtt@blt-vs-render-ctxn:
shard-skl: PASS -> TIMEOUT ([fdo#108039])
igt@kms_atomic_transition@1x-modeset-transitions-fencing:
shard-skl: NOTRUN -> FAIL ([fdo#108470])
igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-c:
shard-skl: NOTRUN -> DMESG-WARN ([fdo#107956])
igt@kms_chv_cursor_fail@pipe-c-128x128-right-edge:
shard-skl: NOTRUN -> FAIL ([fdo#104671])
igt@kms_color@pipe-a-ctm-0-25:
shard-skl: PASS -> FAIL ([fdo#108682])
igt@kms_color@pipe-c-legacy-gamma:
shard-skl: PASS -> FAIL ([fdo#104782])
igt@kms_cursor_crc@cursor-256x256-onscreen:
shard-glk: PASS -> FAIL ([fdo#103232]) +1
igt@kms_cursor_crc@cursor-64x21-random:
{shard-iclb}: NOTRUN -> FAIL ([fdo#103232])
igt@kms_cursor_crc@cursor-64x64-sliding:
shard-apl: PASS -> FAIL ([fdo#103232]) +3
igt@kms_cursor_crc@cursor-64x64-suspend:
shard-apl: PASS -> FAIL ([fdo#103191], [fdo#103232])
igt@kms_draw_crc@draw-method-xrgb8888-render-untiled:
shard-skl: NOTRUN -> FAIL ([fdo#103184])
igt@kms_flip@flip-vs-expired-vblank-interruptible:
shard-glk: PASS -> FAIL ([fdo#105363])
igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-blt:
shard-skl: NOTRUN -> FAIL ([fdo#105682])
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-render:
shard-apl: PASS -> FAIL ([fdo#103167]) +4
igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-mmap-wc:
{shard-iclb}: PASS -> FAIL ([fdo#103167])
igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-render:
shard-skl: NOTRUN -> FAIL ([fdo#103167]) +2
igt@kms_frontbuffer_tracking@fbcpsr-suspend:
shard-skl: PASS -> INCOMPLETE ([fdo#104108], [fdo#106978])
igt@kms_pipe_crc_basic@read-crc-pipe-a-frame-sequence:
shard-skl: NOTRUN -> FAIL ([fdo#103191], [fdo#107362])
igt@kms_plane@plane-position-covered-pipe-c-planes:
{shard-iclb}: NOTRUN -> FAIL ([fdo#103166])
igt@kms_plane_alpha_blend@pipe-a-alpha-transparant-fb:
shard-skl: NOTRUN -> FAIL ([fdo#108145]) +1
igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
shard-skl: NOTRUN -> FAIL ([fdo#107815])
igt@kms_plane_multiple@atomic-pipe-a-tiling-y:
{shard-iclb}: PASS -> FAIL ([fdo#103166])
igt@kms_plane_multiple@atomic-pipe-c-tiling-yf:
shard-apl: PASS -> FAIL ([fdo#103166]) +3
igt@kms_psr@no_drrs:
{shard-iclb}: PASS -> FAIL ([fdo#108341])
igt@kms_rotation_crc@primary-rotation-90:
shard-skl: NOTRUN -> FAIL ([fdo#103925], [fdo#107815])
igt@pm_rpm@gem-pread:
shard-skl: PASS -> INCOMPLETE ([fdo#107807])
igt@pm_rpm@sysfs-read:
{shard-iclb}: PASS -> INCOMPLETE ([fdo#107713], [fdo#108840])
==== Possible fixes ====
igt@kms_chv_cursor_fail@pipe-a-128x128-bottom-edge:
shard-skl: FAIL ([fdo#104671]) -> PASS
igt@kms_color@pipe-a-legacy-gamma:
shard-skl: FAIL ([fdo#104782], [fdo#108145]) -> PASS
igt@kms_cursor_crc@cursor-64x64-dpms:
shard-apl: FAIL ([fdo#103232]) -> PASS +1
igt@kms_cursor_crc@cursor-64x64-offscreen:
shard-skl: FAIL ([fdo#103232]) -> PASS +1
igt@kms_cursor_legacy@cursora-vs-flipa-toggle:
shard-glk: DMESG-WARN ([fdo#105763], [fdo#106538]) -> PASS
igt@kms_draw_crc@draw-method-rgb565-mmap-gtt-xtiled:
shard-glk: FAIL ([fdo#103184]) -> PASS
igt@kms_flip@flip-vs-expired-vblank:
shard-skl: FAIL ([fdo#105363]) -> PASS
igt@kms_flip@flip-vs-expired-vblank-interruptible:
shard-apl: FAIL ([fdo#102887], [fdo#105363]) -> PASS
igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-blt:
shard-skl: FAIL ([fdo#105682]) -> PASS
igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-indfb-draw-mmap-gtt:
shard-skl: FAIL ([fdo#103167]) -> PASS +3
igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-blt:
{shard-iclb}: FAIL ([fdo#103167]) -> PASS +1
igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
shard-skl: FAIL ([fdo#107815], [fdo#108145]) -> PASS
igt@kms_plane_multiple@atomic-pipe-b-tiling-x:
{shard-iclb}: FAIL ([fdo#103166]) -> PASS
igt@kms_setmode@basic:
shard-kbl: FAIL ([fdo#99912]) -> PASS
igt@pm_rpm@fences-dpms:
shard-skl: INCOMPLETE ([fdo#107807]) -> PASS +2
igt@pm_rpm@system-suspend-execbuf:
shard-kbl: INCOMPLETE ([fdo#103665], [fdo#107807]) -> PASS {name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#103158 https://bugs.freedesktop.org/show_bug.cgi?id=103158
fdo#103166 https://bugs.freedesktop.org/show_bug.cgi?id=103166
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103184 https://bugs.freedesktop.org/show_bug.cgi?id=103184
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#103232 https://bugs.freedesktop.org/show_bug.cgi?id=103232
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#103925 https://bugs.freedesktop.org/show_bug.cgi?id=103925
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#104108 https://bugs.freedesktop.org/show_bug.cgi?id=104108
fdo#104671 https://bugs.freedesktop.org/show_bug.cgi?id=104671
fdo#104782 https://bugs.freedesktop.org/show_bug.cgi?id=104782
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105682 https://bugs.freedesktop.org/show_bug.cgi?id=105682
fdo#105763 https://bugs.freedesktop.org/show_bug.cgi?id=105763
fdo#106538 https://bugs.freedesktop.org/show_bug.cgi?id=106538
fdo#106978 https://bugs.freedesktop.org/show_bug.cgi?id=106978
fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
fdo#107713 https://bugs.freedesktop.org/show_bug.cgi?id=107713
fdo#107807 https://bugs.freedesktop.org/show_bug.cgi?id=107807
fdo#107815 https://bugs.freedesktop.org/show_bug.cgi?id=107815
fdo#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956
fdo#108039 https://bugs.freedesktop.org/show_bug.cgi?id=108039
fdo#108145 https://bugs.freedesktop.org/show_bug.cgi?id=108145
fdo#108341 https://bugs.freedesktop.org/show_bug.cgi?id=108341
fdo#108470 https://bugs.freedesktop.org/show_bug.cgi?id=108470
fdo#108667 https://bugs.freedesktop.org/show_bug.cgi?id=108667
fdo#108682 https://bugs.freedesktop.org/show_bug.cgi?id=108682
fdo#108840 https://bugs.freedesktop.org/show_bug.cgi?id=108840
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
== Participating hosts (7 -> 7) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_5211 -> Patchwork_10913
CI_DRM_5211: b6ba4ad91b7c6c4341c40a05b0326470e0c293cb @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4732: eae5c3587e56abc581af9b59060cd316df2caa08 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10913: fdc1419f5262c415fb4e67825e15c30d90e31e6a @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10913/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Hi,
Quoted 11 lines · Uma Shankar
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.
Quoted 5 lines
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.
Quoted 4 lines
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
Quoted 20 lines
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
Quoted 13 lines
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(+)Signature · 1 line
1.9.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 33 lines
-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Brian Starkey
Sent: Wednesday, November 28, 2018 5:27 PM
To: Shankar, Uma <[email protected]>
Cc: Syrjala, Ville <[email protected]>; [email protected]; intel- [email protected]; [email protected]; [email protected]; nd <[email protected]>; Lankhorst, Maarten <[email protected]>
Subject: Re: [v4 0/3] Add Colorspace connector property interfaceHi,
Quoted 11 lines · Uma Shankar
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.
Quoted 5 lines
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.
Quoted 5 lines
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.
Quoted 9 lines
Quoted 4 lines
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.:
Quoted 8 lines
- 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.
Quoted 2 lines
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
Quoted 34 lines
Cheers,
-BrianQuoted 15 lines
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.
Quoted 7 lines
Uma Shankar (3):
drm: Add HDMI colorspace property
drm: Add DP colorspace property
drm/i915: Attach colorspace property and enable modesetdrivers/gpu/drm/drm_atomic_uapi.c | 4 ++ drivers/gpu/drm/drm_connector.c | 92++++++++++++++++++++++++++++++++++
Quoted 8 lines
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(+)
Quoted 7 lines
Quoted 3 lines
--
1.9.1_______________________________________________
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
Quoted 39 lines · Uma
Quoted 33 lines
-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Brian Starkey
Sent: Wednesday, November 28, 2018 5:27 PM
To: Shankar, Uma <[email protected]>
Cc: Syrjala, Ville <[email protected]>; [email protected]; intel- [email protected]; [email protected]; [email protected]; nd <[email protected]>; Lankhorst, Maarten <[email protected]>
Subject: Re: [v4 0/3] Add Colorspace connector property interfaceHi,
Quoted 11 lines · Uma Shankar
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.
Quoted 5 lines
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.
Quoted 5 lines
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.
Quoted 7 lines
Only problem which I see is that all the connector properties are created at connector initialization including the
connector->edidproperty. 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.
Quoted 24 lines
Quoted 10 lines
Quoted 5 lines
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.:
Quoted 8 lines
- 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.
Quoted 7 lines
Quoted 2 lines
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
Quoted 44 lines
Regards,
Uma ShankarQuoted 41 lines
Cheers,
-BrianQuoted 15 lines
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.
Quoted 7 lines
Uma Shankar (3):
drm: Add HDMI colorspace property
drm: Add DP colorspace property
drm/i915: Attach colorspace property and enable modesetdrivers/gpu/drm/drm_atomic_uapi.c | 4 ++ drivers/gpu/drm/drm_connector.c | 92++++++++++++++++++++++++++++++++++
Quoted 11 lines
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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 60 lines
-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Brian Starkey
Sent: Wednesday, November 28, 2018 8:17 PM
To: Shankar, Uma <[email protected]>
Cc: Syrjala, Ville <[email protected]>; [email protected]; intel- [email protected]; [email protected]; [email protected]; nd <[email protected]>; Lankhorst, Maarten <[email protected]>
Subject: Re: [v4 0/3] Add Colorspace connector property interfaceQuoted 40 lines · Uma
Quoted 34 lines
-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Brian Starkey
Sent: Wednesday, November 28, 2018 5:27 PM
To: Shankar, Uma <[email protected]>
Cc: Syrjala, Ville <[email protected]>; [email protected]; intel- [email protected]; [email protected]; [email protected]; nd <[email protected]>; Lankhorst, Maarten <[email protected]>
Subject: Re: [v4 0/3] Add Colorspace connector property interfaceHi,
Quoted 12 lines · Uma Shankar
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.Quoted 5 lines
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.
Quoted 5 lines
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.
Quoted 6 lines
Only problem which I see is that all the connector properties are created at connector initialization including the
connector->edidproperty. 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
Quoted 7 lines
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).
Quoted 1 line
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
Quoted 79 lines
Quoted 15 lines
Quoted 15 lines
Quoted 5 lines
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.Quoted 8 lines
Quoted 3 lines
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.
Quoted 2 lines
Quoted 2 lines
BTW, is there already a standard property for converting CRTC output to
YCbCr?
Quoted 5 lines
Quoted 1 line
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.
Quoted 1 line
Thanks, I'll go take a look at that.
-Brian
Quoted 40 lines
Regards,
Uma ShankarQuoted 37 lines
Cheers,
-BrianQuoted 15 lines
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.
Quoted 7 lines
Uma Shankar (3):
drm: Add HDMI colorspace property
drm: Add DP colorspace property
drm/i915: Attach colorspace property and enable modesetdrivers/gpu/drm/drm_atomic_uapi.c | 4 ++ drivers/gpu/drm/drm_connector.c | 92++++++++++++++++++++++++++++++++++
Quoted 11 lines
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
Quoted 8 lines
Quoted 4 lines
Quoted 4 lines
_______________________________________________
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
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel