Add Colorspace connector property interface
Subsystems (3)
v10 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. Sink supported colorspaces should be retrieved by userspace from EDID and driver will not explicitly expose them.
Basically the expectation from userspace is:
- Set up CRTC DEGAMMA/CTM/GAMMA to convert to some sink colorspace
- Set this new property to let the sink know what it converted the CRTC output to.
- This property is just to inform sink what colorspace source is trying to drive.
Have tested this using xrandr by using below command:
xrandr --output HDMI2 --set "Colorspace" "BT2020_rgb"
v2: Addressed Ville and Maarten's review comments. Merged the 2nd and 3rd patch into one common logical patch.
v3: Removed Adobe references from enum definitions as per Ville, Hans Verkuil and Jonas Karlman suggestions. Changed default to an unset state where driver will assign the colorspace when not chosen by user, suggested by Ville and Maarten. Addressed other misc review comments from Maarten. Split the changes to have separate colorspace property for DP and HDMI.
v4: Addressed Chris and Ville's review comments, and created a common colorspace property for DP and HDMI, filtered the list
v5: Modified the colorspace property creation helper to take platform specific enum list based on the capabilities of the platform as suggested by Shashank. With this there is no need for segregation between DP and HDMI.
v6: Addressed Shashank's review comments.
v7: Added defines instead of enum in uapi as per Brian Starkey's suggestion in order to go with string matching at userspace. Updated the kernel doc as well with more details.
v8: Addressed Maarten's review comments.
v9: Removed macro defines from uapi as per Brian Starkey and Daniel Stone's comments and moved to drm include file. Moved back to older design with exposing all HDMI colorspaces to userspace since infoframe capability is there even on legacy platforms, as per Ville's review comments.
v10: Addressed Maarten' review comment, updated the RB from Maarten and Jani Nikula's ack. Also fixed sparse warnings and checkpatch complaints.
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 | 104 +++++++++++++++++++++++++++++++++ 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 | 25 ++++++++ include/drm/drm_connector.h | 46 +++++++++++++++ 7 files changed, 189 insertions(+)
Signature · 6 lines
1.9.1 _______________________________________________ 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 (rev10)
== Series Details ==
== Series Details ==
Series: Add Colorspace connector property interface (rev10)
URL : https://patchwork.freedesktop.org/series/47132/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 9a1100d27d47 drm: Add HDMI colorspace property a82fbbf3881e drm: Add DP colorspace property -:64: CHECK:LINE_SPACING: Please don't use multiple blank lines #64: FILE: drivers/gpu/drm/drm_connector.c:875: + +
total: 0 errors, 0 warnings, 1 checks, 43 lines checked 8cffc8dcba5a drm/i915: Attach colorspace property and enable modeset
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 1/3 drm: Add HDMI colorspace property
In reply to Uma ShankarCreate 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. Sink supported colorspaces should be retrieved by userspace from EDID and driver will not explicitly expose them.
Basically the expectation from userspace is:
- Set up CRTC DEGAMMA/CTM/GAMMA to convert to some sink colorspace
- Set this new property to let the sink know what it converted the CRTC output to.
v2: Addressed Maarten and Ville's review comments. Enhanced the colorspace enum to incorporate both HDMI and DP supported colorspaces. Also, added a default option for colorspace.
v3: Removed Adobe references from enum definitions as per Ville, Hans Verkuil and Jonas Karlman suggestions. Changed Default to an unset state where driver will assign the colorspace is not chosen by user, suggested by Ville and Maarten. Addressed other misc review comments from Maarten. Split the changes to have separate colorspace property for DP and HDMI.
v4: Addressed Chris and Ville's review comments, and created a common colorspace property for DP and HDMI, filtered the list based on the colorspaces supported by the respective protocol standard.
v5: Made the property creation helper accept enum list based on platform capabilties as suggested by Shashank. Consolidated HDMI and DP property creation in the common helper.
v6: Addressed Shashank's review comments.
v7: Added defines instead of enum in uapi as per Brian Starkey's suggestion in order to go with string matching at userspace. Updated the commit message to add more details as well kernel docs.
v8: Addressed Maarten's review comments.
v9: Removed macro defines from uapi as per Brian Starkey and Daniel Stone's comments and moved to drm include file. Moved back to older design with exposing all HDMI colorspaces to userspace since infoframe capability is there even on legacy platforms, as per Ville's review comments.
v10: Fixed sparse warnings, updated the RB from Maarten and Jani's ack.
--- drivers/gpu/drm/drm_atomic_uapi.c | 4 +++ drivers/gpu/drm/drm_connector.c | 75 +++++++++++++++++++++++++++++++++++++++ include/drm/drm_connector.h | 46 ++++++++++++++++++++++++ 3 files changed, 125 insertions(+)
drivers/gpu/drm/drm_atomic_uapi.c +4 -0
@@ -746,6 +746,8 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector,return -EINVAL ; } state->content_protection = val; + }else if (property == connector->colorspace_property) { + state->colorspace = val; }else if (property == config->writeback_fb_id_property) {struct drm_framebuffer *fb =drm_framebuffer_lookup (dev,NULL , val);int ret =drm_atomic_set_writeback_fb_for_connector (state, fb);
@@ -814,6 +816,8 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector, *val = state->picture_aspect_ratio; }else if (property == config->content_type_property) { *val = state->content_type; + }else if (property == connector->colorspace_property) { + *val = state->colorspace; }else if (property == connector->scaling_mode_property) { *val = state->scaling_mode; }else if (property == connector->content_protection_property) {
drivers/gpu/drm/drm_connector.c +75 -0
87 lines not on this page · raw message
include/drm/drm_connector.h +46 -0
70 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [v10 1/3] drm: Add HDMI colorspace property
Quoted 95 lines · Uma Shankar
Create a new connector property to program colorspace to sink devices. Modern sink devices support more than 1 type of colorspace like 601, 709, BT2020 etc. This helps to switch based on content type which is to be displayed. The decision lies with compositors as to in which scenarios, a particular colorspace will be picked.
This will be helpful mostly to switch to higher gamut colorspaces like BT2020 when the media content is encoded as BT2020. Thereby giving a good visual experience to users.
The expectation from userspace is that it should parse the EDID and get supported colorspaces. Use this property and switch to the one supported. Sink supported colorspaces should be retrieved by userspace from EDID and driver will not explicitly expose them.
Basically the expectation from userspace is:
- Set up CRTC DEGAMMA/CTM/GAMMA to convert to some sink colorspace
- Set this new property to let the sink know what it converted the CRTC output to.v2: Addressed Maarten and Ville's review comments. Enhanced the colorspace enum to incorporate both HDMI and DP supported colorspaces. Also, added a default option for colorspace.
v3: Removed Adobe references from enum definitions as per Ville, Hans Verkuil and Jonas Karlman suggestions. Changed Default to an unset state where driver will assign the colorspace is not chosen by user, suggested by Ville and Maarten. Addressed other misc review comments from Maarten. Split the changes to have separate colorspace property for DP and HDMI.
v4: Addressed Chris and Ville's review comments, and created a common colorspace property for DP and HDMI, filtered the list based on the colorspaces supported by the respective protocol standard.
v5: Made the property creation helper accept enum list based on platform capabilties as suggested by Shashank. Consolidated HDMI and DP property creation in the common helper.
v6: Addressed Shashank's review comments.
v7: Added defines instead of enum in uapi as per Brian Starkey's suggestion in order to go with string matching at userspace. Updated the commit message to add more details as well kernel docs.
v8: Addressed Maarten's review comments.
v9: Removed macro defines from uapi as per Brian Starkey and Daniel Stone's comments and moved to drm include file. Moved back to older design with exposing all HDMI colorspaces to userspace since infoframe capability is there even on legacy platforms, as per Ville's review comments.
v10: Fixed sparse warnings, updated the RB from Maarten and Jani's ack.
Signed-off-by Uma Shankar <[email protected]>Acked-by Jani Nikula <[email protected]>Reviewed-by Shashank Sharma <[email protected]>Reviewed-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/drm_atomic_uapi.c | 4 +++ drivers/gpu/drm/drm_connector.c | 75 +++++++++++++++++++++++++++++++++++++++ include/drm/drm_connector.h | 46 ++++++++++++++++++++++++ 3 files changed, 125 insertions(+)drivers/gpu/drm/drm_atomic_uapi.c +4
-0@@ -746,6 +746,8 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector,return -EINVAL ; } state->content_protection = val; + }else if (property == connector->colorspace_property) { + state->colorspace = val; }else if (property == config->writeback_fb_id_property) {struct drm_framebuffer *fb =drm_framebuffer_lookup (dev,NULL , val);int ret =drm_atomic_set_writeback_fb_for_connector (state, fb);@@ -814,6 +816,8 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector, *val = state->picture_aspect_ratio; }else if (property == config->content_type_property) { *val = state->content_type; + }else if (property == connector->colorspace_property) { + *val = state->colorspace; }else if (property == connector->scaling_mode_property) { *val = state->scaling_mode; }else if (property == connector->content_protection_property) {drivers/gpu/drm/drm_connector.c +0
-0
drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct drm_display_info *info, · line 833
Quoted 8 lines
drivers/gpu/drm/drm_connector.c +5
-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_colorspaces[] = { +/* For Default case, driver will set the colorspace */ + {DRM_MODE_COLORIMETRY_DEFAULT ,"Default" }, +/* Standard Definition Colorimetry based on CEA 861 */ + {DRM_MODE_COLORIMETRY_ITU_601 ,"ITU_601" },
The spec no longer has the BT.601 note here. Which I guess makes sense since BT.601 didn't even specify any color primaries initially. Later versions do by they have distinct primaries for NTSC vs. PAL. The spec calls this just SMPTE 170M now, so I think we should do the same.
drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct drm_display_info *info, · line 842
Quoted 9 lines
drivers/gpu/drm/drm_connector.c +9
-0+ { DRM_MODE_COLORIMETRY_ITU_709, "ITU_709" }, +/* Standard Definition Colorimetry based on IEC 61966-2-4 */ + { DRM_MODE_COLORIMETRY_XV_YCC_601, "XV_YCC_601" }, +/* High Definition Colorimetry based on IEC 61966-2-4 */ + { DRM_MODE_COLORIMETRY_XV_YCC_709, "XV_YCC_709" }, +/* Colorimetry based on IEC 61966-2-1/Amendment 1 */ + { DRM_MODE_COLORIMETRY_S_YCC_601, "S_YCC_601" }, +/* Colorimetry based on IEC 61966-2-5 [33] */ + { DRM_MODE_COLORIMETRY_OPYCC_601, "opYCC_601" },
The spelling is rather inconsistent here. XV_ vs. S_ vs. op. Why not use the same spelling style for all?
drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct drm_display_info *info, · line 850
Quoted 8 lines
drivers/gpu/drm/drm_connector.c +8
-0+/* Colorimetry based on IEC 61966-2-5 */ + { DRM_MODE_COLORIMETRY_OPRGB, "opRGB" }, +/* Colorimetry based on ITU-R BT.2020 */ + { DRM_MODE_COLORIMETRY_BT2020_RGB, "BT2020_RGB" }, +/* Colorimetry based on ITU-R BT.2020 */ + { DRM_MODE_COLORIMETRY_BT2020_YCC, "BT2020_YCC" }, +/* Colorimetry based on ITU-R BT.2020 */ + { DRM_MODE_COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" },
"BT2020" vs. "ITU_709" is rather inconsistent as well.
We also seem to be missing the two DCI-P3 things here.
Quoted 92 lines
drivers/gpu/drm/drm_connector.c +53
-0+}; +/** * DOC: standard connector properties * @@ -1548,6 +1572,57 @@ int drm_mode_create_aspect_ratio_property(struct drm_device *dev)EXPORT_SYMBOL (drm_mode_create_aspect_ratio_property);/** +* DOC: standard connector properties +* +* Colorspace: +* drm_mode_create_colorspace_property - create colorspace property +* 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. 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. Sink supported colorspaces should be retrieved by +* userspace from EDID and driver will not explicitly expose them. +* +* Basically the expectation from userspace is: +* - Set up CRTC DEGAMMA/CTM/GAMMA to convert to some sink +* colorspace +* - Set this new property to let the sink know what it +* converted the CRTC output to. +* - This property is just to inform sink what colorspace +* source is trying to drive. +* +* Called by a driver the first time it's needed, must be attached to desired +* connectors. +*/ +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_colorspaces, +ARRAY_SIZE (hdmi_colorspaces)); +if (!prop) +return -ENOMEM ; + }else { +DRM_DEBUG_KMS ("Colorspace property not supported\n" ); +return 0 ; + } + + 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 +21
-0@@ -253,6 +253,38 @@ enum drm_panel_orientation { DRM_MODE_PANEL_ORIENTATION_RIGHT_UP, }; +/* +* This is a consolidated colorimetry list supported by HDMI and +* DP protocol standard. The respective connectors will register +* a property with the subset of this list (supported by that +* respective protocol). Userspace will set the colorspace through +* a colorspace property which will be created and exposed to +* userspace. +*/ + +/* For Default case, driver will set the colorspace */ +#define DRM_MODE_COLORIMETRY_DEFAULT 0 +/* CEA 861 Normal Colorimetry options */ +#define DRM_MODE_COLORIMETRY_ITU_601 1 +#define DRM_MODE_COLORIMETRY_ITU_709 2 +/* CEA 861 Extended Colorimetry Options */ +#define DRM_MODE_COLORIMETRY_XV_YCC_601 3 +#define DRM_MODE_COLORIMETRY_XV_YCC_709 4 +#define DRM_MODE_COLORIMETRY_S_YCC_601 5 +#define DRM_MODE_COLORIMETRY_OPYCC_601 6 +#define DRM_MODE_COLORIMETRY_OPRGB 7 +#define DRM_MODE_COLORIMETRY_BT2020_RGB 8
include/drm/drm_connector.h enum drm_panel_orientation { · line 286
Quoted 10 lines
include/drm/drm_connector.h +10
-0+#define DRM_MODE_COLORIMETRY_BT2020_YCC 9 +#define DRM_MODE_COLORIMETRY_BT2020_CYCC 10 +/* DP MSA Colorimetry Options */ +#define DRM_MODE_DP_COLORIMETRY_Y_CBCR_ITU_601 11 +#define DRM_MODE_DP_COLORIMETRY_Y_CBCR_ITU_709 12 +#define DRM_MODE_DP_COLORIMETRY_SRGB 13 +#define DRM_MODE_DP_COLORIMETRY_RGB_WIDE_GAMUT 14 +#define DRM_MODE_DP_COLORIMETRY_SCRGB 15 +#define DRM_MODE_DP_COLORIMETRY_DCI_P3 16 +#define DRM_MODE_DP_COLORIMETRY_CUSTOM_COLOR_PROFILE 17
I think some kind of macro to define these would be good. Assuming we're trying directly interpret these as the C/EC/ACE bits. I can't remember if multiple enum values can have the same integer value. If not we'd also need a YCbCr vs. RGB bit in there somewhere. Assuming we want to keep RGB and YCbCr separate. Currently only BT.2020 has a conflict between the two.
Quoted 46 lines
include/drm/drm_connector.h +15
-0+/** * struct drm_display_info - runtime data about the connected sink * @@ -503,6 +535,13 @@ struct drm_connector_state {unsigned int content_protection;/** +* @colorspace: State variable for Connector property to request +* colorspace change on Sink. This is most commonly used to switch +* to wider color gamuts like BT2020. +*/ +u32 colorspace; + +/** * @writeback_job: Writeback job for writeback connectors * * Holds the framebuffer and out-fence for a writeback connector. As @@ -995,6 +1034,12 @@ struct drm_connector {struct drm_property *content_protection_property;/** +* @colorspace_property: Connector property to set the suitable +* colorspace supported by the sink. +*/ +struct drm_property *colorspace_property; + +/** * @path_blob_ptr: * * DRM blob property data for the DP MST path property. This should only @@ -1269,6 +1314,7 @@ int drm_connector_attach_vrr_capable_property(int drm_connector_attach_content_protection_property (struct drm_connector *connector);int drm_mode_create_aspect_ratio_property (struct drm_device *dev); +int drm_mode_create_colorspace_property (struct drm_connector *connector);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);Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [v10 1/3] drm: Add HDMI colorspace property
Quoted 237 lines · Ville Syrjälä
Quoted 95 lines · Uma Shankar
Create a new connector property to program colorspace to sink devices. Modern sink devices support more than 1 type of colorspace like 601, 709, BT2020 etc. This helps to switch based on content type which is to be displayed. The decision lies with compositors as to in which scenarios, a particular colorspace will be picked.
This will be helpful mostly to switch to higher gamut colorspaces like BT2020 when the media content is encoded as BT2020. Thereby giving a good visual experience to users.
The expectation from userspace is that it should parse the EDID and get supported colorspaces. Use this property and switch to the one supported. Sink supported colorspaces should be retrieved by userspace from EDID and driver will not explicitly expose them.
Basically the expectation from userspace is:
- Set up CRTC DEGAMMA/CTM/GAMMA to convert to some sink colorspace
- Set this new property to let the sink know what it converted the CRTC output to.v2: Addressed Maarten and Ville's review comments. Enhanced the colorspace enum to incorporate both HDMI and DP supported colorspaces. Also, added a default option for colorspace.
v3: Removed Adobe references from enum definitions as per Ville, Hans Verkuil and Jonas Karlman suggestions. Changed Default to an unset state where driver will assign the colorspace is not chosen by user, suggested by Ville and Maarten. Addressed other misc review comments from Maarten. Split the changes to have separate colorspace property for DP and HDMI.
v4: Addressed Chris and Ville's review comments, and created a common colorspace property for DP and HDMI, filtered the list based on the colorspaces supported by the respective protocol standard.
v5: Made the property creation helper accept enum list based on platform capabilties as suggested by Shashank. Consolidated HDMI and DP property creation in the common helper.
v6: Addressed Shashank's review comments.
v7: Added defines instead of enum in uapi as per Brian Starkey's suggestion in order to go with string matching at userspace. Updated the commit message to add more details as well kernel docs.
v8: Addressed Maarten's review comments.
v9: Removed macro defines from uapi as per Brian Starkey and Daniel Stone's comments and moved to drm include file. Moved back to older design with exposing all HDMI colorspaces to userspace since infoframe capability is there even on legacy platforms, as per Ville's review comments.
v10: Fixed sparse warnings, updated the RB from Maarten and Jani's ack.
Signed-off-by Uma Shankar <[email protected]>Acked-by Jani Nikula <[email protected]>Reviewed-by Shashank Sharma <[email protected]>Reviewed-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/drm_atomic_uapi.c | 4 +++ drivers/gpu/drm/drm_connector.c | 75 +++++++++++++++++++++++++++++++++++++++ include/drm/drm_connector.h | 46 ++++++++++++++++++++++++ 3 files changed, 125 insertions(+)drivers/gpu/drm/drm_atomic_uapi.c +4
-0@@ -746,6 +746,8 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector,return -EINVAL ; } state->content_protection = val; + }else if (property == connector->colorspace_property) { + state->colorspace = val; }else if (property == config->writeback_fb_id_property) {struct drm_framebuffer *fb =drm_framebuffer_lookup (dev,NULL , val);int ret =drm_atomic_set_writeback_fb_for_connector (state, fb);@@ -814,6 +816,8 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector, *val = state->picture_aspect_ratio; }else if (property == config->content_type_property) { *val = state->content_type; + }else if (property == connector->colorspace_property) { + *val = state->colorspace; }else if (property == connector->scaling_mode_property) { *val = state->scaling_mode; }else if (property == connector->content_protection_property) {drivers/gpu/drm/drm_connector.c +0
-0drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct drm_display_info *info, · line 833
Quoted 8 lines
drivers/gpu/drm/drm_connector.c +5
-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_colorspaces[] = { +/* For Default case, driver will set the colorspace */ + {DRM_MODE_COLORIMETRY_DEFAULT ,"Default" }, +/* Standard Definition Colorimetry based on CEA 861 */ + {DRM_MODE_COLORIMETRY_ITU_601 ,"ITU_601" },The spec no longer has the BT.601 note here. Which I guess makes sense since BT.601 didn't even specify any color primaries initially. Later versions do by they have distinct primaries for NTSC vs. PAL. The spec calls this just SMPTE 170M now, so I think we should do the same.
drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct drm_display_info *info, · line 842
Quoted 9 lines
drivers/gpu/drm/drm_connector.c +9
-0+ { DRM_MODE_COLORIMETRY_ITU_709, "ITU_709" }, +/* Standard Definition Colorimetry based on IEC 61966-2-4 */ + { DRM_MODE_COLORIMETRY_XV_YCC_601, "XV_YCC_601" }, +/* High Definition Colorimetry based on IEC 61966-2-4 */ + { DRM_MODE_COLORIMETRY_XV_YCC_709, "XV_YCC_709" }, +/* Colorimetry based on IEC 61966-2-1/Amendment 1 */ + { DRM_MODE_COLORIMETRY_S_YCC_601, "S_YCC_601" }, +/* Colorimetry based on IEC 61966-2-5 [33] */ + { DRM_MODE_COLORIMETRY_OPYCC_601, "opYCC_601" },The spelling is rather inconsistent here.
XV_vs. S_ vs. op. Why not use the same spelling style for all?drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct drm_display_info *info, · line 850
Quoted 8 lines
drivers/gpu/drm/drm_connector.c +8
-0+/* Colorimetry based on IEC 61966-2-5 */ + { DRM_MODE_COLORIMETRY_OPRGB, "opRGB" }, +/* Colorimetry based on ITU-R BT.2020 */ + { DRM_MODE_COLORIMETRY_BT2020_RGB, "BT2020_RGB" }, +/* Colorimetry based on ITU-R BT.2020 */ + { DRM_MODE_COLORIMETRY_BT2020_YCC, "BT2020_YCC" }, +/* Colorimetry based on ITU-R BT.2020 */ + { DRM_MODE_COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" },"BT2020" vs. "
ITU_709" is rather inconsistent as well.We also seem to be missing the two DCI-P3 things here.
Quoted 101 lines
drivers/gpu/drm/drm_connector.c +53
-0+}; +/** * DOC: standard connector properties * @@ -1548,6 +1572,57 @@ int drm_mode_create_aspect_ratio_property(struct drm_device *dev)EXPORT_SYMBOL (drm_mode_create_aspect_ratio_property);/** +* DOC: standard connector properties +* +* Colorspace: +* drm_mode_create_colorspace_property - create colorspace property +* 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. 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. Sink supported colorspaces should be retrieved by +* userspace from EDID and driver will not explicitly expose them. +* +* Basically the expectation from userspace is: +* - Set up CRTC DEGAMMA/CTM/GAMMA to convert to some sink +* colorspace +* - Set this new property to let the sink know what it +* converted the CRTC output to. +* - This property is just to inform sink what colorspace +* source is trying to drive. +* +* Called by a driver the first time it's needed, must be attached to desired +* connectors. +*/ +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_colorspaces, +ARRAY_SIZE (hdmi_colorspaces)); +if (!prop) +return -ENOMEM ; + }else { +DRM_DEBUG_KMS ("Colorspace property not supported\n" ); +return 0 ; + } + + 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 +30
-0@@ -253,6 +253,38 @@ enum drm_panel_orientation { DRM_MODE_PANEL_ORIENTATION_RIGHT_UP, }; +/* +* This is a consolidated colorimetry list supported by HDMI and +* DP protocol standard. The respective connectors will register +* a property with the subset of this list (supported by that +* respective protocol). Userspace will set the colorspace through +* a colorspace property which will be created and exposed to +* userspace. +*/ + +/* For Default case, driver will set the colorspace */ +#define DRM_MODE_COLORIMETRY_DEFAULT 0 +/* CEA 861 Normal Colorimetry options */ +#define DRM_MODE_COLORIMETRY_ITU_601 1 +#define DRM_MODE_COLORIMETRY_ITU_709 2 +/* CEA 861 Extended Colorimetry Options */ +#define DRM_MODE_COLORIMETRY_XV_YCC_601 3 +#define DRM_MODE_COLORIMETRY_XV_YCC_709 4 +#define DRM_MODE_COLORIMETRY_S_YCC_601 5 +#define DRM_MODE_COLORIMETRY_OPYCC_601 6 +#define DRM_MODE_COLORIMETRY_OPRGB 7 +#define DRM_MODE_COLORIMETRY_BT2020_RGB 8 +#define DRM_MODE_COLORIMETRY_BT2020_YCC 9 +#define DRM_MODE_COLORIMETRY_BT2020_CYCC 10 +/* DP MSA Colorimetry Options */ +#define DRM_MODE_DP_COLORIMETRY_Y_CBCR_ITU_601 11 +#define DRM_MODE_DP_COLORIMETRY_Y_CBCR_ITU_709 12 +#define DRM_MODE_DP_COLORIMETRY_SRGB 13 +#define DRM_MODE_DP_COLORIMETRY_RGB_WIDE_GAMUT 14 +#define DRM_MODE_DP_COLORIMETRY_SCRGB 15 +#define DRM_MODE_DP_COLORIMETRY_DCI_P3 16
Quoted 8 lines
include/drm/drm_connector.h enum drm_panel_orientation { · line 286
Quoted 1 line
include/drm/drm_connector.h +1
-0+#define DRM_MODE_DP_COLORIMETRY_CUSTOM_COLOR_PROFILE 17I think some kind of macro to define these would be good. Assuming we're trying directly interpret these as the C/EC/ACE bits. I can't remember if multiple enum values can have the same integer value. If not we'd also need a YCbCr vs. RGB bit in there somewhere. Assuming we want to keep RGB and YCbCr separate. Currently only BT.2020 has a conflict between the two.
So I think I'm leaning towards having separate YCbCr vs. RGB values (which is what you had here already, with BT.2020 being the only case where that actually matters). That way someone could even do YCbCr 4:4:4 passthrough by just stuffing YUV data into their RGB framebuffer (with the components swizzled the right way).
The one thing that rather breaks that usecase is the automagic 4k YCbCr 4:2:0 fallback. So in in order to guarantee that things work correctly I guess we still need explcit control over the output CSC.
Ie. some kind of output color encoding prop like this:
default /* current behaviour */ ycbcr BT.601 ycbcr BT.709 ycbcr BT.2020 /* no ycbcr 4:2:0 fallback for below modes? */ rgb 4:4:4 ycbcr 4:4:4 BT.601 ycbcr 4:4:4 BT.709 ycbcr 4:4:4 BT.2020 ycbcr 4:2:2 BT.601 ycbcr 4:2:2 BT.709 ycbcr 4:2:2 BT.2020 ycbcr 4:2:0 BT.601 ycbcr 4:2:0 BT.709 ycbcr 4:2:0 BT.2020
Hmm. In fact the automagic 4:2:0 fallback sort of breaks the colorspace prop alredy because if someone set an RGB colorspace but we end up converting to YCbCr 4:2:0 what should we tell the sink? Maybe we just reject the modeset in that case and tell users they need to wait for the output color encoding prop to support that usecase?
Quoted 55 lines
Quoted 47 lines
include/drm/drm_connector.h +15
-0+/** * struct drm_display_info - runtime data about the connected sink * @@ -503,6 +535,13 @@ struct drm_connector_state {unsigned int content_protection;/** +* @colorspace: State variable for Connector property to request +* colorspace change on Sink. This is most commonly used to switch +* to wider color gamuts like BT2020. +*/ +u32 colorspace; + +/** * @writeback_job: Writeback job for writeback connectors * * Holds the framebuffer and out-fence for a writeback connector. As @@ -995,6 +1034,12 @@ struct drm_connector {struct drm_property *content_protection_property;/** +* @colorspace_property: Connector property to set the suitable +* colorspace supported by the sink. +*/ +struct drm_property *colorspace_property; + +/** * @path_blob_ptr: * * DRM blob property data for the DP MST path property. This should only @@ -1269,6 +1314,7 @@ int drm_connector_attach_vrr_capable_property(int drm_connector_attach_content_protection_property (struct drm_connector *connector);int drm_mode_create_aspect_ratio_property (struct drm_device *dev); +int drm_mode_create_colorspace_property (struct drm_connector *connector);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);Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RE: [Intel-gfx] [v10 1/3] drm: Add HDMI colorspace property
Quoted 99 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Monday, February 4, 2019 8:55 PM
To: Shankar, Uma <[email protected]>
Cc: [email protected]; Syrjala, Ville <[email protected]>; Lankhorst, Maarten <[email protected]>; dri- [email protected]
Subject: Re: [Intel-gfx] [v10 1/3] drm: Add HDMI colorspace propertyQuoted 57 lines · Ville Syrjälä
Quoted 56 lines · Uma Shankar
Create a new connector property to program colorspace to sink devices. Modern sink devices support more than 1 type of colorspace like 601, 709, BT2020 etc. This helps to switch based on content type which is to be displayed. The decision lies with compositors as to in which scenarios, a particular colorspace will be picked.
This will be helpful mostly to switch to higher gamut colorspaces like BT2020 when the media content is encoded as BT2020. Thereby giving a good visual experience to users.
The expectation from userspace is that it should parse the EDID and get supported colorspaces. Use this property and switch to the one supported. Sink supported colorspaces should be retrieved by userspace from EDID and driver will not explicitly expose them.
Basically the expectation from userspace is:
- Set up CRTC DEGAMMA/CTM/GAMMA to convert to some sink colorspace
- Set this new property to let the sink know what it converted the CRTC output to.v2: Addressed Maarten and Ville's review comments. Enhanced the colorspace enum to incorporate both HDMI and DP supported colorspaces. Also, added a default option for colorspace.
v3: Removed Adobe references from enum definitions as per Ville, Hans Verkuil and Jonas Karlman suggestions. Changed Default to an unset state where driver will assign the colorspace is not chosen by user, suggested by Ville and Maarten. Addressed other misc review comments from Maarten. Split the changes to have separate colorspace property for DP and HDMI.
v4: Addressed Chris and Ville's review comments, and created a common colorspace property for DP and HDMI, filtered the list based on the colorspaces supported by the respective protocol standard.
v5: Made the property creation helper accept enum list based on platform capabilties as suggested by Shashank. Consolidated HDMI and DP property creation in the common helper.
v6: Addressed Shashank's review comments.
v7: Added defines instead of enum in uapi as per Brian Starkey's suggestion in order to go with string matching at userspace. Updated the commit message to add more details as well kernel docs.
v8: Addressed Maarten's review comments.
v9: Removed macro defines from uapi as per Brian Starkey and Daniel Stone's comments and moved to drm include file. Moved back to older design with exposing all HDMI colorspaces to userspace since infoframe capability is there even on legacy platforms, as per Ville's review comments.
v10: Fixed sparse warnings, updated the RB from Maarten and Jani's ack.
Quoted 7 lines
Quoted 7 lines
Signed-off-by Uma Shankar <[email protected]>Acked-by Jani Nikula <[email protected]>Reviewed-by Shashank Sharma <[email protected]>Reviewed-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/drm_atomic_uapi.c | 4 +++ drivers/gpu/drm/drm_connector.c | 75+++++++++++++++++++++++++++++++++++++++
Quoted 9 lines
drivers/gpu/drm/drm_atomic_uapi.c static int drm_atomic_connector_set_property(struct
Quoted 9 lines
include/drm/drm_connector.h | 46 ++++++++++++++++++++++++ 3 files changed, 125 insertions(+)drivers/gpu/drm/drm_atomic_uapi.c +0
-0@@ -746,6 +746,8 @@ static int drm_atomic_connector_set_property(struct
drm_connector*connector,Quoted 7 lines
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);
Quoted 1 line
drivers/gpu/drm/drm_atomic_uapi.c static int drm_atomic_connector_set_property(struct · line 753
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
drivers/gpu/drm/drm_atomic_uapi.c static int drm_atomic_connector_set_property(struct
Quoted 1 line
drivers/gpu/drm/drm_atomic_uapi.c +0
-0@@ -814,6 +816,8 @@ static int drm_atomic_connector_set_property(struct
drm_connector*connector,
Quoted 27 lines
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/drm_atomic_uapi.c +2
-0*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;Quoted 8 lines
drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct · line 827
Quoted 8 lines
drivers/gpu/drm/drm_atomic_uapi.c +0
-0}else if (property == connector->content_protection_property) {(quoted diff) +0
-0
b/drivers/gpu/drm/drm_connector.cindex 8475396..ed10dd9 100644drivers/gpu/drm/drm_connector.c +0
-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)Quoted 11 lines
drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct drm_display_info *info, · line 833
Quoted 6 lines
drivers/gpu/drm/drm_connector.c +5
-0+static const struct drm_prop_enum_list hdmi_colorspaces[] = { +/* For Default case, driver will set the colorspace */ + {DRM_MODE_COLORIMETRY_DEFAULT ,"Default" }, +/* Standard Definition Colorimetry based on CEA 861 */ + {DRM_MODE_COLORIMETRY_ITU_601 ,"ITU_601" },The spec no longer has the BT.601 note here. Which I guess makes sense since BT.601 didn't even specify any color primaries initially. Later versions do by they have distinct primaries for NTSC vs. PAL. The spec calls this just SMPTE 170M now, so I think we should do the same.
Ok Sure, Will update this name. Yeah this was a little confusing as to what name to go with. Will take the one defined now in spec i.e., SMPTE 170M.
Quoted 13 lines
Quoted 13 lines
drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct drm_display_info *info, · line 842
Quoted 10 lines
drivers/gpu/drm/drm_connector.c +9
-0+ { DRM_MODE_COLORIMETRY_ITU_709, "ITU_709" }, +/* Standard Definition Colorimetry based on IEC 61966-2-4 */ + { DRM_MODE_COLORIMETRY_XV_YCC_601, "XV_YCC_601" }, +/* High Definition Colorimetry based on IEC 61966-2-4 */ + { DRM_MODE_COLORIMETRY_XV_YCC_709, "XV_YCC_709" }, +/* Colorimetry based on IEC 61966-2-1/Amendment 1 */ + { DRM_MODE_COLORIMETRY_S_YCC_601, "S_YCC_601" }, +/* Colorimetry based on IEC 61966-2-5 [33] */ + { DRM_MODE_COLORIMETRY_OPYCC_601, "opYCC_601" },The spelling is rather inconsistent here.
XV_vs. S_ vs. op. Why not use the same spelling style for all?
This is the names defined in spec and I used as is. I will make them as XVYCC, SYCC and OPYCC for consistency. Hope this is ok ?
Quoted 11 lines
Quoted 11 lines
drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct drm_display_info *info, · line 850
Quoted 9 lines
drivers/gpu/drm/drm_connector.c +8
-0+/* Colorimetry based on IEC 61966-2-5 */ + { DRM_MODE_COLORIMETRY_OPRGB, "opRGB" }, +/* Colorimetry based on ITU-R BT.2020 */ + { DRM_MODE_COLORIMETRY_BT2020_RGB, "BT2020_RGB" }, +/* Colorimetry based on ITU-R BT.2020 */ + { DRM_MODE_COLORIMETRY_BT2020_YCC, "BT2020_YCC" }, +/* Colorimetry based on ITU-R BT.2020 */ + { DRM_MODE_COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" },"BT2020" vs. "
ITU_709" is rather inconsistent as well.
Ok, will update this.
Quoted 1 line
Quoted 1 line
We also seem to be missing the two DCI-P3 things here.
Yeah, I initially did as per 861.F where it was not there. This got added in 861.G, will add this.
Quoted 143 lines
Quoted 37 lines
Quoted 37 lines
drivers/gpu/drm/drm_connector.c +29
-0+}; +/** * DOC: standard connector properties * @@ -1548,6 +1572,57 @@ int drm_mode_create_aspect_ratio_property(struct drm_device *dev)EXPORT_SYMBOL (drm_mode_create_aspect_ratio_property);/** +* DOC: standard connector properties +* +* Colorspace: +* drm_mode_create_colorspace_property - create colorspace property +* 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. 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. Sink supported colorspaces should be retrieved by +* userspace from EDID and driver will not explicitly expose them. +* +* Basically the expectation from userspace is: +* - Set up CRTC DEGAMMA/CTM/GAMMA to convert to some sink +* colorspace +* - Set this new property to let the sink know what it +* converted the CRTC output to. +* - This property is just to inform sink what colorspace +* source is trying to drive. +* +* Called by a driver the first time it's needed, must be attached +to desired +* connectors. +*/ Quoted 8 lines
drivers/gpu/drm/drm_connector.c int drm_mode_create_aspect_ratio_property(struct drm_device *dev)
Quoted 8 lines
drivers/gpu/drm/drm_connector.c +8
-0+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,Quoted 3 lines
drivers/gpu/drm/drm_connector.c int drm_mode_create_aspect_ratio_property(struct drm_device *dev) · line 1618
Quoted 3 lines
drivers/gpu/drm/drm_connector.c +3
-0+"Colorspace" , + hdmi_colorspaces, +ARRAY_SIZE(hdmi_colorspaces));Quoted 45 lines
Quoted 45 lines
drivers/gpu/drm/drm_connector.c +14
-0+if (!prop) +return -ENOMEM ; + }else { +DRM_DEBUG_KMS ("Colorspace property not supported\n" ); +return 0 ; + } + + 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 * (quoted diff) +0
-0
b/include/drm/drm_connector.hindex 9941613..29495b3 100644include/drm/drm_connector.h +20
-0@@ -253,6 +253,38 @@ enum drm_panel_orientation { DRM_MODE_PANEL_ORIENTATION_RIGHT_UP, }; +/* +* This is a consolidated colorimetry list supported by HDMI and +* DP protocol standard. The respective connectors will register +* a property with the subset of this list (supported by that +* respective protocol). Userspace will set the colorspace through +* a colorspace property which will be created and exposed to +* userspace. +*/ + +/* For Default case, driver will set the colorspace */ +#define DRM_MODE_COLORIMETRY_DEFAULT 0 +/* CEA 861 Normal Colorimetry options */ +#define DRM_MODE_COLORIMETRY_ITU_601 1 +#define DRM_MODE_COLORIMETRY_ITU_709 2 +/* CEA 861 Extended Colorimetry Options */ +#define DRM_MODE_COLORIMETRY_XV_YCC_601 3 +#define DRM_MODE_COLORIMETRY_XV_YCC_709 4 +#define DRM_MODE_COLORIMETRY_S_YCC_601 5 +#define DRM_MODE_COLORIMETRY_OPYCC_601 6 +#define DRM_MODE_COLORIMETRY_OPRGB 7Quoted 8 lines
include/drm/drm_connector.h enum drm_panel_orientation {
Quoted 8 lines
include/drm/drm_connector.h +8
-0+#define DRM_MODE_COLORIMETRY_BT2020_RGB 8 +#define DRM_MODE_COLORIMETRY_BT2020_YCC 9 +#define DRM_MODE_COLORIMETRY_BT2020_CYCC 10 +/* DP MSA Colorimetry Options */ +#define DRM_MODE_DP_COLORIMETRY_Y_CBCR_ITU_601 11 +#define DRM_MODE_DP_COLORIMETRY_Y_CBCR_ITU_709 12 +#define DRM_MODE_DP_COLORIMETRY_SRGB 13 +#define DRM_MODE_DP_COLORIMETRY_RGB_WIDE_GAMUT 14Quoted 3 lines
include/drm/drm_connector.h enum drm_panel_orientation {
Quoted 3 lines
include/drm/drm_connector.h +3
-0+#define DRM_MODE_DP_COLORIMETRY_SCRGB 15 +#define DRM_MODE_DP_COLORIMETRY_DCI_P3 16 +#define DRM_MODE_DP_COLORIMETRY_CUSTOM_COLOR_PROFILE 17Quoted 7 lines
I think some kind of macro to define these would be good. Assuming we're trying directly interpret these as the C/EC/ACE bits. I can't remember if multiple enum values can have the same integer value. If not we'd also need a YCbCr vs. RGB bit in there somewhere. Assuming we want to keep RGB and YCbCr separate. Currently only BT.2020 has a conflict between the two.
So I think I'm leaning towards having separate YCbCr vs. RGB values (which is what you had here already, with BT.2020 being the only case where that actually matters). That way someone could even do YCbCr 4:4:4 passthrough by just stuffing YUV data into their RGB framebuffer (with the components swizzled the right way).
The one thing that rather breaks that usecase is the automagic 4k YCbCr 4:2:0 fallback. So in in order to guarantee that things work correctly I guess we still need explcit control over the output CSC.
Ie. some kind of output color encoding prop like this:
default /* current behaviour */ ycbcr BT.601 ycbcr BT.709 ycbcr BT.2020 /* no ycbcr 4:2:0 fallback for below modes? */ rgb 4:4:4 ycbcr 4:4:4 BT.601 ycbcr 4:4:4 BT.709 ycbcr 4:4:4 BT.2020 ycbcr 4:2:2 BT.601 ycbcr 4:2:2 BT.709 ycbcr 4:2:2 BT.2020 ycbcr 4:2:0 BT.601 ycbcr 4:2:0 BT.709 ycbcr 4:2:0 BT.2020
Quoted 5 lines
Hmm. In fact the automagic 4:2:0 fallback sort of breaks the colorspace prop alredy because if someone set an RGB colorspace but we end up converting to YCbCr 4:2:0 what should we tell the sink? Maybe we just reject the modeset in that case and tell users they need to wait for the output color encoding prop to support that usecase?
Hi yes, an output encoding property to control this make sense and will be useful.
So if a user decides to have a RGB buffer at source or wants to blend multiple layers in RGB, and still want o/p converted to YUV420 at o/p, he can use the current colorspace property to set that and send to sink. In case he doesn't do it explicitly we can still let the content be driven but with warnings or choose to fail his modeset if that seems better.
What do you suggest, should we keep current property interface like this and extend the usage with a separate property on top of it.
Thanks Ville for your review comments and suggestions.
Regards,
Uma Shankar
Quoted 61 lines
Quoted 34 lines
Quoted 34 lines
include/drm/drm_connector.h +8
-0+/** * struct drm_display_info - runtime data about the connected sink * @@ -503,6 +535,13 @@ struct drm_connector_state {unsigned int content_protection;/** +* @colorspace: State variable for Connector property to request +* colorspace change on Sink. This is most commonly used to switch +* to wider color gamuts like BT2020. +*/ +u32 colorspace; + +/** * @writeback_job: Writeback job for writeback connectors * * Holds the framebuffer and out-fence for a writeback connector. As @@ -995,6 +1034,12 @@ struct
drm_connector{include/drm/drm_connector.h +6
-0struct drm_property *content_protection_property;/** +* @colorspace_property: Connector property to set the suitable +* colorspace supported by the sink. +*/ +struct drm_property *colorspace_property; + +/** * @path_blob_ptr: * * DRM blob property data for the DP MST path property. This should only @@ -1269,6 +1314,7 @@ int
Quoted 8 lines
Quoted 8 lines
drm_connector_attach_vrr_capable_property(
int drm_connector_attach_content_protection_property(
structdrm_connector*connector); intdrm_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
Quoted 1 line
const struct
drm_connector_state
*conn_state);Quoted 8 lines
Quoted 7 lines
--
1.9.1_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfxQuoted 7 lines
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 3 lines
--
Ville Syrjälä
Intel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [Intel-gfx] [v10 1/3] drm: Add HDMI colorspace property
Quoted 315 lines · Uma
Quoted 99 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Monday, February 4, 2019 8:55 PM
To: Shankar, Uma <[email protected]>
Cc: [email protected]; Syrjala, Ville <[email protected]>; Lankhorst, Maarten <[email protected]>; dri- [email protected]
Subject: Re: [Intel-gfx] [v10 1/3] drm: Add HDMI colorspace propertyQuoted 57 lines · Ville Syrjälä
Quoted 56 lines · Uma Shankar
Create a new connector property to program colorspace to sink devices. Modern sink devices support more than 1 type of colorspace like 601, 709, BT2020 etc. This helps to switch based on content type which is to be displayed. The decision lies with compositors as to in which scenarios, a particular colorspace will be picked.
This will be helpful mostly to switch to higher gamut colorspaces like BT2020 when the media content is encoded as BT2020. Thereby giving a good visual experience to users.
The expectation from userspace is that it should parse the EDID and get supported colorspaces. Use this property and switch to the one supported. Sink supported colorspaces should be retrieved by userspace from EDID and driver will not explicitly expose them.
Basically the expectation from userspace is:
- Set up CRTC DEGAMMA/CTM/GAMMA to convert to some sink colorspace
- Set this new property to let the sink know what it converted the CRTC output to.v2: Addressed Maarten and Ville's review comments. Enhanced the colorspace enum to incorporate both HDMI and DP supported colorspaces. Also, added a default option for colorspace.
v3: Removed Adobe references from enum definitions as per Ville, Hans Verkuil and Jonas Karlman suggestions. Changed Default to an unset state where driver will assign the colorspace is not chosen by user, suggested by Ville and Maarten. Addressed other misc review comments from Maarten. Split the changes to have separate colorspace property for DP and HDMI.
v4: Addressed Chris and Ville's review comments, and created a common colorspace property for DP and HDMI, filtered the list based on the colorspaces supported by the respective protocol standard.
v5: Made the property creation helper accept enum list based on platform capabilties as suggested by Shashank. Consolidated HDMI and DP property creation in the common helper.
v6: Addressed Shashank's review comments.
v7: Added defines instead of enum in uapi as per Brian Starkey's suggestion in order to go with string matching at userspace. Updated the commit message to add more details as well kernel docs.
v8: Addressed Maarten's review comments.
v9: Removed macro defines from uapi as per Brian Starkey and Daniel Stone's comments and moved to drm include file. Moved back to older design with exposing all HDMI colorspaces to userspace since infoframe capability is there even on legacy platforms, as per Ville's review comments.
v10: Fixed sparse warnings, updated the RB from Maarten and Jani's ack.
Quoted 7 lines
Quoted 7 lines
Signed-off-by Uma Shankar <[email protected]>Acked-by Jani Nikula <[email protected]>Reviewed-by Shashank Sharma <[email protected]>Reviewed-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/drm_atomic_uapi.c | 4 +++ drivers/gpu/drm/drm_connector.c | 75+++++++++++++++++++++++++++++++++++++++
Quoted 9 lines
drivers/gpu/drm/drm_atomic_uapi.c static int drm_atomic_connector_set_property(struct
Quoted 9 lines
include/drm/drm_connector.h | 46 ++++++++++++++++++++++++ 3 files changed, 125 insertions(+)drivers/gpu/drm/drm_atomic_uapi.c +0
-0@@ -746,6 +746,8 @@ static int drm_atomic_connector_set_property(struct
drm_connector*connector,Quoted 7 lines
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);
Quoted 1 line
drivers/gpu/drm/drm_atomic_uapi.c static int drm_atomic_connector_set_property(struct · line 753
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
drivers/gpu/drm/drm_atomic_uapi.c static int drm_atomic_connector_set_property(struct
Quoted 1 line
drivers/gpu/drm/drm_atomic_uapi.c +0
-0@@ -814,6 +816,8 @@ static int drm_atomic_connector_set_property(struct
drm_connector*connector,Quoted 27 lines
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/drm_atomic_uapi.c +2
-0*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;Quoted 8 lines
drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct · line 827
Quoted 8 lines
drivers/gpu/drm/drm_atomic_uapi.c +0
-0}else if (property == connector->content_protection_property) {(quoted diff) +0
-0
b/drivers/gpu/drm/drm_connector.cindex 8475396..ed10dd9 100644drivers/gpu/drm/drm_connector.c +0
-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)Quoted 11 lines
drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct drm_display_info *info, · line 833
Quoted 6 lines
drivers/gpu/drm/drm_connector.c +5
-0+static const struct drm_prop_enum_list hdmi_colorspaces[] = { +/* For Default case, driver will set the colorspace */ + {DRM_MODE_COLORIMETRY_DEFAULT ,"Default" }, +/* Standard Definition Colorimetry based on CEA 861 */ + {DRM_MODE_COLORIMETRY_ITU_601 ,"ITU_601" },The spec no longer has the BT.601 note here. Which I guess makes sense since BT.601 didn't even specify any color primaries initially. Later versions do by they have distinct primaries for NTSC vs. PAL. The spec calls this just SMPTE 170M now, so I think we should do the same.
Ok Sure, Will update this name. Yeah this was a little confusing as to what name to go with. Will take the one defined now in spec i.e., SMPTE 170M.
Quoted 13 lines
Quoted 13 lines
drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct drm_display_info *info, · line 842
Quoted 10 lines
drivers/gpu/drm/drm_connector.c +9
-0+ { DRM_MODE_COLORIMETRY_ITU_709, "ITU_709" }, +/* Standard Definition Colorimetry based on IEC 61966-2-4 */ + { DRM_MODE_COLORIMETRY_XV_YCC_601, "XV_YCC_601" }, +/* High Definition Colorimetry based on IEC 61966-2-4 */ + { DRM_MODE_COLORIMETRY_XV_YCC_709, "XV_YCC_709" }, +/* Colorimetry based on IEC 61966-2-1/Amendment 1 */ + { DRM_MODE_COLORIMETRY_S_YCC_601, "S_YCC_601" }, +/* Colorimetry based on IEC 61966-2-5 [33] */ + { DRM_MODE_COLORIMETRY_OPYCC_601, "opYCC_601" },The spelling is rather inconsistent here.
XV_vs. S_ vs. op. Why not use the same spelling style for all?This is the names defined in spec and I used as is. I will make them as XVYCC, SYCC and OPYCC for consistency. Hope this is ok ?
Quoted 11 lines
Quoted 11 lines
drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct drm_display_info *info, · line 850
Quoted 9 lines
drivers/gpu/drm/drm_connector.c +8
-0+/* Colorimetry based on IEC 61966-2-5 */ + { DRM_MODE_COLORIMETRY_OPRGB, "opRGB" }, +/* Colorimetry based on ITU-R BT.2020 */ + { DRM_MODE_COLORIMETRY_BT2020_RGB, "BT2020_RGB" }, +/* Colorimetry based on ITU-R BT.2020 */ + { DRM_MODE_COLORIMETRY_BT2020_YCC, "BT2020_YCC" }, +/* Colorimetry based on ITU-R BT.2020 */ + { DRM_MODE_COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" },"BT2020" vs. "
ITU_709" is rather inconsistent as well.Ok, will update this.
Quoted 1 line
Quoted 1 line
We also seem to be missing the two DCI-P3 things here.
Yeah, I initially did as per 861.F where it was not there. This got added in 861.G, will add this.
Quoted 143 lines
Quoted 37 lines
Quoted 37 lines
drivers/gpu/drm/drm_connector.c +29
-0+}; +/** * DOC: standard connector properties * @@ -1548,6 +1572,57 @@ int drm_mode_create_aspect_ratio_property(struct drm_device *dev)EXPORT_SYMBOL (drm_mode_create_aspect_ratio_property);/** +* DOC: standard connector properties +* +* Colorspace: +* drm_mode_create_colorspace_property - create colorspace property +* 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. 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. Sink supported colorspaces should be retrieved by +* userspace from EDID and driver will not explicitly expose them. +* +* Basically the expectation from userspace is: +* - Set up CRTC DEGAMMA/CTM/GAMMA to convert to some sink +* colorspace +* - Set this new property to let the sink know what it +* converted the CRTC output to. +* - This property is just to inform sink what colorspace +* source is trying to drive. +* +* Called by a driver the first time it's needed, must be attached +to desired +* connectors. +*/ Quoted 8 lines
drivers/gpu/drm/drm_connector.c int drm_mode_create_aspect_ratio_property(struct drm_device *dev)
Quoted 8 lines
drivers/gpu/drm/drm_connector.c +8
-0+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,Quoted 3 lines
drivers/gpu/drm/drm_connector.c int drm_mode_create_aspect_ratio_property(struct drm_device *dev) · line 1618
Quoted 3 lines
drivers/gpu/drm/drm_connector.c +3
-0+"Colorspace" , + hdmi_colorspaces, +ARRAY_SIZE(hdmi_colorspaces));Quoted 45 lines
Quoted 45 lines
drivers/gpu/drm/drm_connector.c +14
-0+if (!prop) +return -ENOMEM ; + }else { +DRM_DEBUG_KMS ("Colorspace property not supported\n" ); +return 0 ; + } + + 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 * (quoted diff) +0
-0
b/include/drm/drm_connector.hindex 9941613..29495b3 100644include/drm/drm_connector.h +20
-0@@ -253,6 +253,38 @@ enum drm_panel_orientation { DRM_MODE_PANEL_ORIENTATION_RIGHT_UP, }; +/* +* This is a consolidated colorimetry list supported by HDMI and +* DP protocol standard. The respective connectors will register +* a property with the subset of this list (supported by that +* respective protocol). Userspace will set the colorspace through +* a colorspace property which will be created and exposed to +* userspace. +*/ + +/* For Default case, driver will set the colorspace */ +#define DRM_MODE_COLORIMETRY_DEFAULT 0 +/* CEA 861 Normal Colorimetry options */ +#define DRM_MODE_COLORIMETRY_ITU_601 1 +#define DRM_MODE_COLORIMETRY_ITU_709 2 +/* CEA 861 Extended Colorimetry Options */ +#define DRM_MODE_COLORIMETRY_XV_YCC_601 3 +#define DRM_MODE_COLORIMETRY_XV_YCC_709 4 +#define DRM_MODE_COLORIMETRY_S_YCC_601 5 +#define DRM_MODE_COLORIMETRY_OPYCC_601 6 +#define DRM_MODE_COLORIMETRY_OPRGB 7Quoted 8 lines
include/drm/drm_connector.h enum drm_panel_orientation {
Quoted 8 lines
include/drm/drm_connector.h +8
-0+#define DRM_MODE_COLORIMETRY_BT2020_RGB 8 +#define DRM_MODE_COLORIMETRY_BT2020_YCC 9 +#define DRM_MODE_COLORIMETRY_BT2020_CYCC 10 +/* DP MSA Colorimetry Options */ +#define DRM_MODE_DP_COLORIMETRY_Y_CBCR_ITU_601 11 +#define DRM_MODE_DP_COLORIMETRY_Y_CBCR_ITU_709 12 +#define DRM_MODE_DP_COLORIMETRY_SRGB 13 +#define DRM_MODE_DP_COLORIMETRY_RGB_WIDE_GAMUT 14Quoted 3 lines
include/drm/drm_connector.h enum drm_panel_orientation {
Quoted 3 lines
include/drm/drm_connector.h +3
-0+#define DRM_MODE_DP_COLORIMETRY_SCRGB 15 +#define DRM_MODE_DP_COLORIMETRY_DCI_P3 16 +#define DRM_MODE_DP_COLORIMETRY_CUSTOM_COLOR_PROFILE 17Quoted 7 lines
I think some kind of macro to define these would be good. Assuming we're trying directly interpret these as the C/EC/ACE bits. I can't remember if multiple enum values can have the same integer value. If not we'd also need a YCbCr vs. RGB bit in there somewhere. Assuming we want to keep RGB and YCbCr separate. Currently only BT.2020 has a conflict between the two.
So I think I'm leaning towards having separate YCbCr vs. RGB values (which is what you had here already, with BT.2020 being the only case where that actually matters). That way someone could even do YCbCr 4:4:4 passthrough by just stuffing YUV data into their RGB framebuffer (with the components swizzled the right way).
The one thing that rather breaks that usecase is the automagic 4k YCbCr 4:2:0 fallback. So in in order to guarantee that things work correctly I guess we still need explcit control over the output CSC.
Ie. some kind of output color encoding prop like this:
default /* current behaviour */ ycbcr BT.601 ycbcr BT.709 ycbcr BT.2020 /* no ycbcr 4:2:0 fallback for below modes? */ rgb 4:4:4 ycbcr 4:4:4 BT.601 ycbcr 4:4:4 BT.709 ycbcr 4:4:4 BT.2020 ycbcr 4:2:2 BT.601 ycbcr 4:2:2 BT.709 ycbcr 4:2:2 BT.2020 ycbcr 4:2:0 BT.601 ycbcr 4:2:0 BT.709 ycbcr 4:2:0 BT.2020Quoted 5 lines
Hmm. In fact the automagic 4:2:0 fallback sort of breaks the colorspace prop alredy because if someone set an RGB colorspace but we end up converting to YCbCr 4:2:0 what should we tell the sink? Maybe we just reject the modeset in that case and tell users they need to wait for the output color encoding prop to support that usecase?
Quoted 8 lines
Hi yes, an output encoding property to control this make sense and will be useful.
So if a user decides to have a RGB buffer at source or wants to blend multiple layers in RGB, and still want o/p converted to YUV420 at o/p, he can use the current colorspace property to set that and send to sink. In case he doesn't do it explicitly we can still let the content be driven but with warnings or choose to fail his modeset if that seems better.What do you suggest, should we keep current property interface like this and extend the usage with a separate property on top of it.
I think separate prop to control the output CSC is best. The colorspace prop should only control the infoframe. If the two are in violent disagreement we can fail the modeset.
Quoted 70 lines
Thanks Ville for your review comments and suggestions.
Regards,
Uma ShankarQuoted 64 lines
Quoted 34 lines
Quoted 34 lines
include/drm/drm_connector.h +8
-0+/** * struct drm_display_info - runtime data about the connected sink * @@ -503,6 +535,13 @@ struct drm_connector_state {unsigned int content_protection;/** +* @colorspace: State variable for Connector property to request +* colorspace change on Sink. This is most commonly used to switch +* to wider color gamuts like BT2020. +*/ +u32 colorspace; + +/** * @writeback_job: Writeback job for writeback connectors * * Holds the framebuffer and out-fence for a writeback connector. As @@ -995,6 +1034,12 @@ struct
drm_connector{include/drm/drm_connector.h +6
-0struct drm_property *content_protection_property;/** +* @colorspace_property: Connector property to set the suitable +* colorspace supported by the sink. +*/ +struct drm_property *colorspace_property; + +/** * @path_blob_ptr: * * DRM blob property data for the DP MST path property. This should only @@ -1269,6 +1314,7 @@ int
Quoted 8 lines
Quoted 8 lines
drm_connector_attach_vrr_capable_property(
int drm_connector_attach_content_protection_property(
structdrm_connector*connector); intdrm_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
Quoted 1 line
const struct
drm_connector_state
*conn_state);Quoted 8 lines
Quoted 7 lines
--
1.9.1_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfxQuoted 7 lines
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx--
Ville Syrjälä
Intel
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
RE: [Intel-gfx] [v10 1/3] drm: Add HDMI colorspace property
Quoted 350 lines
-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ville Syrjälä
Sent: Monday, February 4, 2019 10:54 PM
To: Shankar, Uma <[email protected]>
Cc: [email protected]; Syrjala, Ville <[email protected]>; dri- [email protected]; Lankhorst, Maarten <[email protected]>
Subject: Re: [Intel-gfx] [v10 1/3] drm: Add HDMI colorspace propertyQuoted 11 lines · Uma
Quoted 11 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Monday, February 4, 2019 8:55 PM
To: Shankar, Uma <[email protected]>
Cc: [email protected]; Syrjala, Ville <[email protected]>; Lankhorst, Maarten <[email protected]>; dri- [email protected]
Subject: Re: [Intel-gfx] [v10 1/3] drm: Add HDMI colorspace propertyQuoted 7 lines
Quoted 7 lines · Ville Syrjälä
Quoted 6 lines · Uma Shankar
Quoted 5 lines
Create a new connector property to program colorspace to sink devices. Modern sink devices support more than 1 type of colorspace like 601, 709, BT2020 etc. This helps to switch based on content type which is to be displayed. The decision lies with compositors as to in which scenarios, a particular colorspace will be
picked.
Quoted 101 lines
Quoted 101 lines
Quoted 51 lines
Quoted 51 lines
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. Sink supported colorspaces should be retrieved by userspace from EDID and driver will not explicitly expose them.
Basically the expectation from userspace is:
- Set up CRTC DEGAMMA/CTM/GAMMA to convert to some sink colorspace
- Set this new property to let the sink know what it converted the CRTC output to.v2: Addressed Maarten and Ville's review comments. Enhanced the colorspace enum to incorporate both HDMI and DP supported colorspaces. Also, added a default option for colorspace.
v3: Removed Adobe references from enum definitions as per Ville, Hans Verkuil and Jonas Karlman suggestions. Changed Default to an unset state where driver will assign the colorspace is not chosen by user, suggested by Ville and Maarten. Addressed other misc review comments from Maarten. Split the changes to have separate colorspace property for DP and HDMI.
v4: Addressed Chris and Ville's review comments, and created a common colorspace property for DP and HDMI, filtered the list based on the colorspaces supported by the respective protocol standard.
v5: Made the property creation helper accept enum list based on platform capabilties as suggested by Shashank. Consolidated HDMI and DP property creation in the common helper.
v6: Addressed Shashank's review comments.
v7: Added defines instead of enum in uapi as per Brian Starkey's suggestion in order to go with string matching at userspace. Updated the commit message to add more details as well kernel docs.
v8: Addressed Maarten's review comments.
v9: Removed macro defines from uapi as per Brian Starkey and Daniel Stone's comments and moved to drm include file. Moved back to older design with exposing all HDMI colorspaces to userspace since infoframe capability is there even on legacy platforms, as per Ville's review comments.
v10: Fixed sparse warnings, updated the RB from Maarten and Jani's ack.
Quoted 8 lines
Quoted 8 lines
Signed-off-by Uma Shankar <[email protected]>Acked-by Jani Nikula <[email protected]>Reviewed-by Shashank Sharma <[email protected]>Reviewed-by Maarten Lankhorst--- drivers/gpu/drm/drm_atomic_uapi.c | 4 +++ drivers/gpu/drm/drm_connector.c | 75+++++++++++++++++++++++++++++++++++++++
Quoted 10 lines
Quoted 10 lines
include/drm/drm_connector.h | 46 ++++++++++++++++++++++++ 3 files changed, 125 insertions(+)drivers/gpu/drm/drm_atomic_uapi.c +0
-0@@ -746,6 +746,8 @@ static intdrm_atomic_connector_set_property(struct
drm_connector*connector,Quoted 7 lines
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);
Quoted 1 line
Quoted 1 line
int ret = drm_atomic_set_writeback_fb_for_connector(state,
fb);
Quoted 2 lines
Quoted 2 lines
drivers/gpu/drm/drm_atomic_uapi.c +0
-0@@ -814,6 +816,8 @@ static intdrm_atomic_connector_set_property(struct
drm_connector*connector,Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/drm_atomic_uapi.c +2
-0*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;Quoted 8 lines
drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct · line 827
Quoted 8 lines
} else if (property ==
connector->content_protection_property)
{ diff --gita/drivers/gpu/drm/drm_connector.cb/drivers/gpu/drm/drm_connector.cindex 8475396..ed10dd9 100644drivers/gpu/drm/drm_connector.c +0
-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)Quoted 1 line
Quoted 1 line
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct drm_display_info *info, · line 833
Quoted 5 lines
drivers/gpu/drm/drm_connector.c +5
-0+static const struct drm_prop_enum_list hdmi_colorspaces[] = { +/* For Default case, driver will set the colorspace */ + {DRM_MODE_COLORIMETRY_DEFAULT ,"Default" }, +/* Standard Definition Colorimetry based on CEA 861 */ + {DRM_MODE_COLORIMETRY_ITU_601 ,"ITU_601" },The spec no longer has the BT.601 note here. Which I guess makes sense since BT.601 didn't even specify any color primaries initially. Later versions do by they have distinct primaries for NTSC vs. PAL. The spec calls this just SMPTE 170M now, so I think we should
do the same.
Quoted 49 lines
Ok Sure, Will update this name. Yeah this was a little confusing as to what name to go with. Will take the one defined now in spec i.e., SMPTE 170M.
Quoted 13 lines
Quoted 13 lines
drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct drm_display_info *info, · line 842
Quoted 10 lines
drivers/gpu/drm/drm_connector.c +9
-0+ { DRM_MODE_COLORIMETRY_ITU_709, "ITU_709" }, +/* Standard Definition Colorimetry based on IEC 61966-2-4 */ + { DRM_MODE_COLORIMETRY_XV_YCC_601, "XV_YCC_601" }, +/* High Definition Colorimetry based on IEC 61966-2-4 */ + { DRM_MODE_COLORIMETRY_XV_YCC_709, "XV_YCC_709" }, +/* Colorimetry based on IEC 61966-2-1/Amendment 1 */ + { DRM_MODE_COLORIMETRY_S_YCC_601, "S_YCC_601" }, +/* Colorimetry based on IEC 61966-2-5 [33] */ + { DRM_MODE_COLORIMETRY_OPYCC_601, "opYCC_601" },The spelling is rather inconsistent here.
XV_vs. S_ vs. op. Why not use the same spelling style for all?This is the names defined in spec and I used as is. I will make them as XVYCC, SYCC and OPYCC for consistency. Hope this is ok ?
Quoted 11 lines
Quoted 11 lines
drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct drm_display_info *info, · line 850
Quoted 9 lines
drivers/gpu/drm/drm_connector.c +8
-0+/* Colorimetry based on IEC 61966-2-5 */ + { DRM_MODE_COLORIMETRY_OPRGB, "opRGB" }, +/* Colorimetry based on ITU-R BT.2020 */ + { DRM_MODE_COLORIMETRY_BT2020_RGB, "BT2020_RGB" }, +/* Colorimetry based on ITU-R BT.2020 */ + { DRM_MODE_COLORIMETRY_BT2020_YCC, "BT2020_YCC" }, +/* Colorimetry based on ITU-R BT.2020 */ + { DRM_MODE_COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" },"BT2020" vs. "
ITU_709" is rather inconsistent as well.Ok, will update this.
Quoted 1 line
Quoted 1 line
We also seem to be missing the two DCI-P3 things here.
Yeah, I initially did as per 861.F where it was not there. This got added in 861.G, will add this.
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
drivers/gpu/drm/drm_connector.c +2
-0+}; +/** * DOC: standard connector properties * @@ -1548,6 +1572,57 @@ int drm_mode_create_aspect_ratio_property(struct drm_device *dev)EXPORT_SYMBOL (drm_mode_create_aspect_ratio_property);Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/drm_connector.c int drm_mode_create_aspect_ratio_property(struct drm_device *dev)
Quoted 5 lines
drivers/gpu/drm/drm_connector.c +4
-0/** +* DOC: standard connector properties +* +* Colorspace: +* drm_mode_create_colorspace_property - create colorspace property
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
drivers/gpu/drm/drm_connector.c int drm_mode_create_aspect_ratio_property(struct drm_device *dev)
Quoted 3 lines
drivers/gpu/drm/drm_connector.c +3
-0+* 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
Quoted 33 lines
Quoted 33 lines
Quoted 20 lines
Quoted 20 lines
drivers/gpu/drm/drm_connector.c +20
-0+* is being played by the user, same for any other colorspace. 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. Sink supported colorspaces should be retrieved by +* userspace from EDID and driver will not explicitly expose them. +* +* Basically the expectation from userspace is: +* - Set up CRTC DEGAMMA/CTM/GAMMA to convert to some sink +* colorspace +* - Set this new property to let the sink know what it +* converted the CRTC output to. +* - This property is just to inform sink what colorspace +* source is trying to drive. +* +* Called by a driver the first time it's needed, must be +attached to desired +* connectors. +*/ Quoted 8 lines
drivers/gpu/drm/drm_connector.c int drm_mode_create_aspect_ratio_property(struct drm_device *dev)
Quoted 8 lines
drivers/gpu/drm/drm_connector.c +8
-0+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,Quoted 3 lines
drivers/gpu/drm/drm_connector.c int drm_mode_create_aspect_ratio_property(struct drm_device *dev) · line 1618
Quoted 3 lines
drivers/gpu/drm/drm_connector.c +3
-0+"Colorspace" , + hdmi_colorspaces, +ARRAY_SIZE(hdmi_colorspaces));Quoted 15 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/drm_connector.c +7
-0+if (!prop) +return -ENOMEM ; + }else { +DRM_DEBUG_KMS ("Colorspace property not supported\n" ); +return 0 ; + } +Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/drm_connector.c int drm_mode_create_aspect_ratio_property(struct drm_device *dev)
Quoted 8 lines
drivers/gpu/drm/drm_connector.c +7
-0+ connector->colorspace_property = prop; + +return 0 ; +} +EXPORT_SYMBOL (drm_mode_create_colorspace_property); + +/** * drm_mode_create_content_type_property - create content type property
Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
Quoted 19 lines
drivers/gpu/drm/drm_connector.c +0
-0* @dev: DRM device * (quoted diff) +0
-0
b/include/drm/drm_connector.hindex 9941613..29495b3 100644include/drm/drm_connector.h +9
-0@@ -253,6 +253,38 @@ enum drm_panel_orientation { DRM_MODE_PANEL_ORIENTATION_RIGHT_UP, }; +/* +* 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. +*/ Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
include/drm/drm_connector.h enum drm_panel_orientation {
Quoted 8 lines
include/drm/drm_connector.h +8
-0+ +/* For Default case, driver will set the colorspace */ +#define DRM_MODE_COLORIMETRY_DEFAULT 0 +/* CEA 861 Normal Colorimetry options */ +#define DRM_MODE_COLORIMETRY_ITU_601 1 +#define DRM_MODE_COLORIMETRY_ITU_709 2 +/* CEA 861 Extended Colorimetry Options */ +#define DRM_MODE_COLORIMETRY_XV_YCC_601 3Quoted 1 line
Quoted 1 line
Quoted 1 line
include/drm/drm_connector.h enum drm_panel_orientation { · line 273
Quoted 1 line
include/drm/drm_connector.h +1
-0+#define DRM_MODE_COLORIMETRY_XV_YCC_709 4Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
include/drm/drm_connector.h enum drm_panel_orientation { · line 275
Quoted 2 lines
include/drm/drm_connector.h +2
-0+#define DRM_MODE_COLORIMETRY_S_YCC_601 5 +#define DRM_MODE_COLORIMETRY_OPYCC_601 6Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
include/drm/drm_connector.h enum drm_panel_orientation { · line 277
Quoted 2 lines
include/drm/drm_connector.h +2
-0+#define DRM_MODE_COLORIMETRY_OPRGB 7 +#define DRM_MODE_COLORIMETRY_BT2020_RGB 8Quoted 1 line
Quoted 1 line
Quoted 1 line
include/drm/drm_connector.h enum drm_panel_orientation { · line 278
Quoted 1 line
include/drm/drm_connector.h +1
-0+#define DRM_MODE_COLORIMETRY_BT2020_YCC 9Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
include/drm/drm_connector.h enum drm_panel_orientation {
Quoted 3 lines
include/drm/drm_connector.h +3
-0+#define DRM_MODE_COLORIMETRY_BT2020_CYCC 10 +/* DP MSA Colorimetry Options */ +#define DRM_MODE_DP_COLORIMETRY_Y_CBCR_ITU_601 11Quoted 1 line
Quoted 1 line
Quoted 1 line
include/drm/drm_connector.h enum drm_panel_orientation { · line 282
Quoted 1 line
include/drm/drm_connector.h +1
-0+#define DRM_MODE_DP_COLORIMETRY_Y_CBCR_ITU_709 12Quoted 42 lines
Quoted 42 lines
Quoted 2 lines
include/drm/drm_connector.h enum drm_panel_orientation { · line 284
Quoted 2 lines
include/drm/drm_connector.h +2
-0+#define DRM_MODE_DP_COLORIMETRY_SRGB 13 +#define DRM_MODE_DP_COLORIMETRY_RGB_WIDE_GAMUT 14Quoted 3 lines
include/drm/drm_connector.h enum drm_panel_orientation {
Quoted 3 lines
include/drm/drm_connector.h +3
-0+#define DRM_MODE_DP_COLORIMETRY_SCRGB 15 +#define DRM_MODE_DP_COLORIMETRY_DCI_P3 16 +#define DRM_MODE_DP_COLORIMETRY_CUSTOM_COLOR_PROFILE 17Quoted 7 lines
I think some kind of macro to define these would be good. Assuming we're trying directly interpret these as the C/EC/ACE bits. I can't remember if multiple enum values can have the same integer value. If not we'd also need a YCbCr vs. RGB bit in there somewhere. Assuming we want to keep RGB and YCbCr separate. Currently only BT.2020 has a conflict between the two.
So I think I'm leaning towards having separate YCbCr vs. RGB values (which is what you had here already, with BT.2020 being the only case where that actually matters). That way someone could even do YCbCr 4:4:4 passthrough by just stuffing YUV data into their RGB framebuffer (with the components swizzled the right way).
The one thing that rather breaks that usecase is the automagic 4k YCbCr 4:2:0 fallback. So in in order to guarantee that things work correctly I guess we still need explcit control over the output CSC.
Ie. some kind of output color encoding prop like this:
default /* current behaviour */ ycbcr BT.601 ycbcr BT.709 ycbcr BT.2020 /* no ycbcr 4:2:0 fallback for below modes? */ rgb 4:4:4 ycbcr 4:4:4 BT.601 ycbcr 4:4:4 BT.709 ycbcr 4:4:4 BT.2020 ycbcr 4:2:2 BT.601 ycbcr 4:2:2 BT.709 ycbcr 4:2:2 BT.2020 ycbcr 4:2:0 BT.601 ycbcr 4:2:0 BT.709 ycbcr 4:2:0 BT.2020Quoted 7 lines
Quoted 5 lines
Hmm. In fact the automagic 4:2:0 fallback sort of breaks the colorspace prop alredy because if someone set an RGB colorspace but we end up converting to YCbCr 4:2:0 what should we tell the sink? Maybe we just reject the modeset in that case and tell users they need to wait for the output color encoding prop to support that usecase?
Hi yes, an output encoding property to control this make sense and will be
useful.
Quoted 4 lines
So if a user decides to have a RGB buffer at source or wants to blend multiple layers in RGB, and still want o/p converted to YUV420 at o/p, he can use the current colorspace property to set that and send to sink. In case he doesn't do it explicitly we can still let the content be driven but
Quoted 8 lines
with warnings or choose to fail his modeset if that seems better.
Quoted 3 lines
What do you suggest, should we keep current property interface like this and extend the usage with a separate property on top of it.
I think separate prop to control the output CSC is best. The colorspace prop should only control the infoframe. If the two are in violent disagreement we can fail the modeset.
Ok Sure, Will take that as a separate task to add a property interface for output CSC. Thanks Ville !!!
Quoted 72 lines
Quoted 71 lines
Thanks Ville for your review comments and suggestions.
Regards,
Uma ShankarQuoted 65 lines
Quoted 35 lines
Quoted 35 lines
include/drm/drm_connector.h +8
-0+/** * struct drm_display_info - runtime data about the connected sink * @@ -503,6 +535,13 @@ struct drm_connector_state {unsigned int content_protection;/** +* @colorspace: State variable for Connector property to request +* colorspace change on Sink. This is most commonly used to switch +* to wider color gamuts like BT2020. +*/ +u32 colorspace; + +/** * @writeback_job: Writeback job for writeback connectors * * Holds the framebuffer and out-fence for a writeback connector. As @@ -995,6 +1034,12 @@ struct
drm_connector{include/drm/drm_connector.h +6
-0struct drm_property *content_protection_property;/** +* @colorspace_property: Connector property to set the suitable +* colorspace supported by the sink. +*/ +struct drm_property *colorspace_property; + +/** * @path_blob_ptr: * * DRM blob property data for the DP MST path property. This should only @@ -1269,6 +1314,7 @@ int
drm_connector_attach_vrr_capable_property(Quoted 8 lines
Quoted 8 lines
int drm_connector_attach_content_protection_property(
structdrm_connector*connector); intdrm_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
Quoted 1 line
const struct
drm_connector_state
*conn_state);Quoted 8 lines
Quoted 7 lines
--
1.9.1_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfxQuoted 7 lines
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx--
Ville Syrjälä
Intel
Quoted 7 lines
--
Ville Syrjälä
Intel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v10 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.
v5: Merged the DP handling along with platform colorspace handling as per Shashank's comments.
v6: Reverted to old design of exposing all colorspaces to userspace as per Ville's review comment
v7: Fixed sparse warnings, updated the RB from Maarten and Jani's ack.
--- 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, { DRM_MODE_COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" }, }; +static const struct drm_prop_enum_list dp_colorspaces[] = { +/* For Default case, driver will set the colorspace */ + {DRM_MODE_COLORIMETRY_DEFAULT ,"Default" }, +/* Standard Definition Colorimetry based on CEA 861 */ + {DRM_MODE_COLORIMETRY_ITU_601 ,"ITU_601" }, + {DRM_MODE_COLORIMETRY_ITU_709 ,"ITU_709" }, +/* Standard Definition Colorimetry based on IEC 61966-2-4 */ + {DRM_MODE_COLORIMETRY_XV_YCC_601 ,"XV_YCC_601" }, +/* High Definition Colorimetry based on IEC 61966-2-4 */ + {DRM_MODE_COLORIMETRY_XV_YCC_709 ,"XV_YCC_709" }, +/* Colorimetry based on IEC 61966-2-5 */ + {DRM_MODE_COLORIMETRY_OPRGB ,"opRGB" }, +/* DP MSA Colorimetry */ + {DRM_MODE_DP_COLORIMETRY_Y_CBCR_ITU_601 ,"YCBCR_ITU_601" }, + {DRM_MODE_DP_COLORIMETRY_Y_CBCR_ITU_709 ,"YCBCR_ITU_709" }, + {DRM_MODE_DP_COLORIMETRY_SRGB ,"sRGB" }, + {DRM_MODE_DP_COLORIMETRY_RGB_WIDE_GAMUT ,"RGB Wide Gamut" }, + {DRM_MODE_DP_COLORIMETRY_SCRGB ,"scRGB" }, + {DRM_MODE_DP_COLORIMETRY_DCI_P3 ,"DCI-P3" }, + {DRM_MODE_DP_COLORIMETRY_CUSTOM_COLOR_PROFILE ,"Custom Profile" }, +}; + +/** * DOC: standard connector properties *
@@ -1611,6 +1634,14 @@ int drm_mode_create_colorspace_property(struct drm_connector *connector) ARRAY_SIZE(hdmi_colorspaces));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_colorspaces, +ARRAY_SIZE (dp_colorspaces)); + +if (!prop) +return -ENOMEM ; }else {DRM_DEBUG_KMS ("Colorspace property not supported\n" );return 0 ;
Signature · 6 lines
1.9.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [v10 2/3] drm: Add DP colorspace property
Quoted 36 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.
v5: Merged the DP handling along with platform colorspace handling as per Shashank's comments.
v6: Reverted to old design of exposing all colorspaces to userspace as per Ville's review comment
v7: Fixed sparse warnings, updated the RB from Maarten and Jani's ack.
Signed-off-by Uma Shankar <[email protected]>Acked-by Jani Nikula <[email protected]>Reviewed-by Maarten Lankhorst <[email protected]>--- drivers/gpu/drm/drm_connector.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)drivers/gpu/drm/drm_connector.c +0
-0
drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct drm_display_info *info, · line 858
Quoted 9 lines
drivers/gpu/drm/drm_connector.c +6
-0@@ -850,6 +850,29 @@ int drm_display_info_set_bus_formats(struct drm_display_info *info, { DRM_MODE_COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" }, }; +static const struct drm_prop_enum_list dp_colorspaces[] = { +/* For Default case, driver will set the colorspace */ + {DRM_MODE_COLORIMETRY_DEFAULT ,"Default" }, +/* Standard Definition Colorimetry based on CEA 861 */ + {DRM_MODE_COLORIMETRY_ITU_601 ,"ITU_601" }, + { DRM_MODE_COLORIMETRY_ITU_709, "ITU_709" },
What's with the duplicated 601/709 values? I think in the HDMI verison you had only these ones here. Maybe we want to actually state explicitly that they are for YCbCr, if only to be consistent with the BT2020 values.
Quoted 4 lines
drivers/gpu/drm/drm_connector.c +4
-0+/* Standard Definition Colorimetry based on IEC 61966-2-4 */ + { DRM_MODE_COLORIMETRY_XV_YCC_601, "XV_YCC_601" }, +/* High Definition Colorimetry based on IEC 61966-2-4 */ + { DRM_MODE_COLORIMETRY_XV_YCC_709, "XV_YCC_709" },
drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct drm_display_info *info, · line 872
Quoted 10 lines
drivers/gpu/drm/drm_connector.c +10
-0+/* Colorimetry based on IEC 61966-2-5 */ + { DRM_MODE_COLORIMETRY_OPRGB, "opRGB" }, +/* DP MSA Colorimetry */ + { DRM_MODE_DP_COLORIMETRY_Y_CBCR_ITU_601, "YCBCR_ITU_601" }, + { DRM_MODE_DP_COLORIMETRY_Y_CBCR_ITU_709, "YCBCR_ITU_709" }, + { DRM_MODE_DP_COLORIMETRY_SRGB, "sRGB" }, + { DRM_MODE_DP_COLORIMETRY_RGB_WIDE_GAMUT, "RGB Wide Gamut" }, + { DRM_MODE_DP_COLORIMETRY_SCRGB, "scRGB" }, + { DRM_MODE_DP_COLORIMETRY_DCI_P3, "DCI-P3" }, + { DRM_MODE_DP_COLORIMETRY_CUSTOM_COLOR_PROFILE, "Custom Profile" },
I don't think we want this last one since we don't implement anything that could transmit the custom profile.
The MSA bits are have "CEA RGB" which we probably want to keep hidden since it seems to be just a poorly specced limited range vs. full range knob, and we already have a mechanism for that. The Y-only and RAW I guess we can skip. Not sure anyone would ever have use for those.
Quoted 28 lines
drivers/gpu/drm/drm_connector.c +11
-0+}; + +/** * DOC: standard connector properties * @@ -1611,6 +1634,14 @@ int drm_mode_create_colorspace_property(struct drm_connector *connector) ARRAY_SIZE(hdmi_colorspaces));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_colorspaces, +ARRAY_SIZE (dp_colorspaces)); + +if (!prop) +return -ENOMEM ; }else {DRM_DEBUG_KMS ("Colorspace property not supported\n" );return 0 ;Signature · 6 lines
1.9.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [v10 2/3] drm: Add DP colorspace property
Quoted 51 lines
-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ville Syrjälä
Sent: Saturday, February 2, 2019 12:48 AM
To: Shankar, Uma <[email protected]>
Cc: [email protected]; [email protected]; Syrjala, Ville <[email protected]>; Lankhorst, Maarten <[email protected]>; [email protected]
Subject: Re: [v10 2/3] drm: Add DP colorspace propertydrivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct
Quoted 35 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.
v5: Merged the DP handling along with platform colorspace handling as per Shashank's comments.
v6: Reverted to old design of exposing all colorspaces to userspace as per Ville's review comment
v7: Fixed sparse warnings, updated the RB from Maarten and Jani's ack.
Signed-off-by Uma Shankar <[email protected]>Acked-by Jani Nikula <[email protected]>Reviewed-by Maarten Lankhorst <[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 ed10dd9..b331be8 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{ DRM_MODE_COLORIMETRY_BT2020_CYCC, "BT2020_CYCC" }, };
Quoted 11 lines
drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct drm_display_info *info, · line 858
Quoted 6 lines
drivers/gpu/drm/drm_connector.c +6
-0+static const struct drm_prop_enum_list dp_colorspaces[] = { +/* For Default case, driver will set the colorspace */ + {DRM_MODE_COLORIMETRY_DEFAULT ,"Default" }, +/* Standard Definition Colorimetry based on CEA 861 */ + {DRM_MODE_COLORIMETRY_ITU_601 ,"ITU_601" }, + {DRM_MODE_COLORIMETRY_ITU_709 ,"ITU_709" },What's with the duplicated 601/709 values? I think in the HDMI verison you had only these ones here. Maybe we want to actually state explicitly that they are for YCbCr, if only to be consistent with the
BT2020 values.
Yeah they are for YCbCr, will add that detail to be clear.
Quoted 20 lines
drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct drm_display_info *info,
Quoted 9 lines
drivers/gpu/drm/drm_connector.c +8
-0+/* Standard Definition Colorimetry based on IEC 61966-2-4 */ + { DRM_MODE_COLORIMETRY_XV_YCC_601, "XV_YCC_601" }, +/* High Definition Colorimetry based on IEC 61966-2-4 */ + { DRM_MODE_COLORIMETRY_XV_YCC_709, "XV_YCC_709" }, +/* Colorimetry based on IEC 61966-2-5 */ + { DRM_MODE_COLORIMETRY_OPRGB, "opRGB" }, +/* DP MSA Colorimetry */ + { DRM_MODE_DP_COLORIMETRY_Y_CBCR_ITU_601, "YCBCR_ITU_601"},
drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct · line 866
Quoted 1 line
drivers/gpu/drm/drm_connector.c +1
-0+ {DRM_MODE_DP_COLORIMETRY_Y_CBCR_ITU_709 ,"YCBCR_ITU_709" },
drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct · line 868
Quoted 2 lines
drivers/gpu/drm/drm_connector.c +2
-0+ { DRM_MODE_DP_COLORIMETRY_SRGB, "sRGB" }, + { DRM_MODE_DP_COLORIMETRY_RGB_WIDE_GAMUT, "RGB WideGamut" },
drivers/gpu/drm/drm_connector.c int drm_display_info_set_bus_formats(struct drm_display_info *info,
Quoted 3 lines
drivers/gpu/drm/drm_connector.c +3
-0+ { DRM_MODE_DP_COLORIMETRY_SCRGB, "scRGB" }, + { DRM_MODE_DP_COLORIMETRY_DCI_P3, "DCI-P3" }, + { DRM_MODE_DP_COLORIMETRY_CUSTOM_COLOR_PROFILE, "CustomProfile" },
Quoted 7 lines
I don't think we want this last one since we don't implement anything that could transmit the custom profile.
The MSA bits are have "CEA RGB" which we probably want to keep hidden since it seems to be just a poorly specced limited range vs. full range knob, and we already have a mechanism for that. The Y-only and RAW I guess we can skip. Not sure anyone would ever have use for those.
Ok Sure, Will drop this.
Regards,
Uma Shankar
Quoted 30 lines
drivers/gpu/drm/drm_connector.c int drm_mode_create_colorspace_property(struct
Quoted 8 lines
drivers/gpu/drm/drm_connector.c +3
-0+}; + +/** * DOC: standard connector properties * @@ -1611,6 +1634,14 @@ int drm_mode_create_colorspace_property(struct
drm_connector*connector)Quoted 1 line
ARRAY_SIZE(hdmi_colorspaces));drivers/gpu/drm/drm_connector.c int drm_mode_create_colorspace_property(struct drm_connector *connector)
Quoted 3 lines
drivers/gpu/drm/drm_connector.c +1
-0if (!prop)return -ENOMEM ; + } else if (connector->connector_type == DRM_MODE_CONNECTOR_eDP|| > + connector->connector_type ==
DRM_MODE_CONNECTOR_DisplayPort) {drivers/gpu/drm/drm_connector.c
Quoted 1 line
drivers/gpu/drm/drm_connector.c +1
-0+ prop = drm_property_create_enum(dev,
DRM_MODE_PROP_ENUM,Quoted 11 lines
drivers/gpu/drm/drm_connector.c +5
-1+"Colorspace" , dp_colorspaces, + ARRAY_SIZE(dp_colorspaces)); + +if (!prop) +return -ENOMEM ; }else {DRM_DEBUG_KMS ("Colorspace property not supported\n" );return 0 ; --1.9.1
Quoted 12 lines
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel--
Ville Syrjälä
Intel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v10 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.
v5: Merged the DP handling along with platform colorspace handling as per Shashank's comments.
v6: Reverted to old design of exposing all colorspaces to userspace as per Ville's review comment
v7: Fixed a checkpatch complaint, Addressed Maarten' review comment, updated the RB from Maarten and Jani's ack.
--- 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 | 25 +++++++++++++++++++++++++ 4 files changed, 35 insertions(+)
drivers/gpu/drm/i915/intel_atomic.c +1 -0
@@ -124,6 +124,7 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn,*/ if (new_conn_state->force_audio != old_conn_state->force_audio || new_conn_state->broadcast_rgb != old_conn_state->broadcast_rgb || + new_conn_state->base.colorspace != old_conn_state->base.colorspace || new_conn_state->base.picture_aspect_ratio != old_conn_state->base.picture_aspect_ratio || new_conn_state->base.content_type != old_conn_state->base.content_type || new_conn_state->base.scaling_mode != old_conn_state->base.scaling_mode)
drivers/gpu/drm/i915/intel_connector.c +8 -0
@@ -265,3 +265,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
@@ -1783,6 +1783,7 @@ int intel_connector_update_modes(struct drm_connector *connector,void intel_attach_force_audio_property (struct drm_connector *connector);void intel_attach_broadcast_rgb_property (struct drm_connector *connector);void intel_attach_aspect_ratio_property (struct drm_connector *connector); +void intel_attach_colorspace_property (struct drm_connector *connector);/* intel_csr.c */ void intel_csr_ucode_init (struct drm_i915_private *);
drivers/gpu/drm/i915/intel_hdmi.c +25 -0
@@ -498,6 +498,24 @@ static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder,else frame.avi.colorspace =HDMI_COLORSPACE_RGB ; +if (conn_state->colorspace ==DRM_MODE_COLORIMETRY_DEFAULT ) { +/* Set ITU 709 as default for HDMI */ + frame.avi.colorimetry =DRM_MODE_COLORIMETRY_ITU_709 ; + }else if (conn_state->colorspace <DRM_MODE_COLORIMETRY_XV_YCC_601 ) { + frame.avi.colorimetry = conn_state->colorspace; + }else { + frame.avi.colorimetry =HDMI_COLORIMETRY_EXTENDED ; +/* +* Starting from extended list where COLORIMETRY_XV_YCC_601 +* is the first extended mode and its value is 0 as per HDMI +* specification. +* TODO: This needs to be extended for LSPCON implementation +* as well. Will be implemented separately. +*/ + frame.avi.extended_colorimetry = conn_state->colorspace - +DRM_MODE_COLORIMETRY_XV_YCC_601 ; + } + drm_hdmi_avi_infoframe_quant_range(&frame.avi, conn_state->connector, adjusted_mode,
@@ -2143,10 +2161,17 @@ static void intel_hdmi_destroy(struct drm_connector *connector) intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *connector) { struct drm_i915_private *dev_priv = to_i915(connector->dev); +struct intel_digital_port *intel_dig_port = +hdmi_to_dig_port (intel_hdmi);intel_attach_force_audio_property (connector);intel_attach_broadcast_rgb_property (connector);intel_attach_aspect_ratio_property (connector); + +/* Attach Colorspace property for Non LSPCON based device */ +if (!intel_dig_port->lspcon.active) +intel_attach_colorspace_property (connector); +drm_connector_attach_content_type_property (connector); connector->state->picture_aspect_ratio =HDMI_PICTURE_ASPECT_NONE ;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [v10 3/3] drm/i915: Attach colorspace property and enable modeset
Quoted 87 lines · Uma Shankar
This patch attaches the colorspace connector property to the hdmi connector. Based on colorspace change, modeset will be triggered to switch to new colorspace.
Based on colorspace property value create an infoframe with appropriate colorspace. This can be used to send an infoframe packet with proper colorspace value set which will help to enable wider color gamut like BT2020 on sink.
This patch attaches and enables HDMI colorspace, DP will be taken care separately.
v2: Merged the changes of creating infoframe as well to this patch as per Maarten's suggestion.
v3: Addressed review comments from Shashank. Separated HDMI and DP colorspaces as suggested by Ville and Maarten.
v4: Addressed Chris and Ville's review comments, and created a common colorspace property for DP and HDMI, filtered the list based on the colorspaces supported by the respective protocol standard. Handle the default case properly.
v5: Merged the DP handling along with platform colorspace handling as per Shashank's comments.
v6: Reverted to old design of exposing all colorspaces to userspace as per Ville's review comment
v7: Fixed a checkpatch complaint, Addressed Maarten' review comment, updated the RB from Maarten and Jani's ack.
Signed-off-by Uma Shankar <[email protected]>Acked-by Jani Nikula <[email protected]>Reviewed-by Maarten Lankhorst <[email protected]>--- 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 | 25 +++++++++++++++++++++++++ 4 files changed, 35 insertions(+)drivers/gpu/drm/i915/intel_atomic.c +1
-0@@ -124,6 +124,7 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn,*/ if (new_conn_state->force_audio != old_conn_state->force_audio || new_conn_state->broadcast_rgb != old_conn_state->broadcast_rgb || + new_conn_state->base.colorspace != old_conn_state->base.colorspace || new_conn_state->base.picture_aspect_ratio != old_conn_state->base.picture_aspect_ratio || new_conn_state->base.content_type != old_conn_state->base.content_type || new_conn_state->base.scaling_mode != old_conn_state->base.scaling_mode)drivers/gpu/drm/i915/intel_connector.c +8
-0@@ -265,3 +265,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@@ -1783,6 +1783,7 @@ int intel_connector_update_modes(struct drm_connector *connector,void intel_attach_force_audio_property (struct drm_connector *connector);void intel_attach_broadcast_rgb_property (struct drm_connector *connector);void intel_attach_aspect_ratio_property (struct drm_connector *connector); +void intel_attach_colorspace_property (struct drm_connector *connector);/* intel_csr.c */ void intel_csr_ucode_init (struct drm_i915_private *);drivers/gpu/drm/i915/intel_hdmi.c +0
-0
drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder, · line 503
Quoted 6 lines
drivers/gpu/drm/i915/intel_hdmi.c +3
-0@@ -498,6 +498,24 @@ static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder,else frame.avi.colorspace =HDMI_COLORSPACE_RGB ; +if (conn_state->colorspace ==DRM_MODE_COLORIMETRY_DEFAULT ) { +/* Set ITU 709 as default for HDMI */ + frame.avi.colorimetry =DRM_MODE_COLORIMETRY_ITU_709 ;
Default should map to NONE.
Quoted 4 lines
drivers/gpu/drm/i915/intel_hdmi.c +4
-0+ }else if (conn_state->colorspace <DRM_MODE_COLORIMETRY_XV_YCC_601 ) { + frame.avi.colorimetry = conn_state->colorspace; + }else { + frame.avi.colorimetry =HDMI_COLORIMETRY_EXTENDED ;
drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder, · line 517
Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +10
-0+/* +* Starting from extended list where COLORIMETRY_XV_YCC_601 +* is the first extended mode and its value is 0 as per HDMI +* specification. +* TODO: This needs to be extended for LSPCON implementation +* as well. Will be implemented separately. +*/ + frame.avi.extended_colorimetry = conn_state->colorspace - +DRM_MODE_COLORIMETRY_XV_YCC_601 ; + }
This code seems like something that should be in the core.
Like said earlier maybe we could just directly map the values to these bits, and then this should just become
if.colorimetry = val & 0x3; if.extended_colorimetry = (val >> 2) & 0x7; if.ace = (val >> 5) & 0xf;
Hmm, looks like hdmi.h doesn't even know about the ACE bits yet :(
Quoted 29 lines
drivers/gpu/drm/i915/intel_hdmi.c +8
-0+ drm_hdmi_avi_infoframe_quant_range(&frame.avi, conn_state->connector, adjusted_mode,@@ -2143,10 +2161,17 @@ static void intel_hdmi_destroy(struct drm_connector *connector) intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *connector) { struct drm_i915_private *dev_priv = to_i915(connector->dev); +struct intel_digital_port *intel_dig_port = +hdmi_to_dig_port (intel_hdmi);intel_attach_force_audio_property (connector);intel_attach_broadcast_rgb_property (connector);intel_attach_aspect_ratio_property (connector); + +/* Attach Colorspace property for Non LSPCON based device */ +if (!intel_dig_port->lspcon.active) +intel_attach_colorspace_property (connector); +drm_connector_attach_content_type_property (connector); connector->state->picture_aspect_ratio =HDMI_PICTURE_ASPECT_NONE ;Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [v10 3/3] drm/i915: Attach colorspace property and enable modeset
Quoted 114 lines
-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ville Syrjälä
Sent: Saturday, February 2, 2019 12:31 AM
To: Shankar, Uma <[email protected]>
Cc: [email protected]; Syrjala, Ville <[email protected]>; Lankhorst, Maarten <[email protected]>; dri- [email protected]
Subject: Re: [Intel-gfx] [v10 3/3] drm/i915: Attach colorspace property and enable modesetdrivers/gpu/drm/i915/intel_atomic.c int intel_digital_connector_atomic_check(struct
Quoted 48 lines · Uma Shankar
This patch attaches the colorspace connector property to the hdmi connector. Based on colorspace change, modeset will be triggered to switch to new colorspace.
Based on colorspace property value create an infoframe with appropriate colorspace. This can be used to send an infoframe packet with proper colorspace value set which will help to enable wider color gamut like BT2020 on sink.
This patch attaches and enables HDMI colorspace, DP will be taken care separately.
v2: Merged the changes of creating infoframe as well to this patch as per Maarten's suggestion.
v3: Addressed review comments from Shashank. Separated HDMI and DP colorspaces as suggested by Ville and Maarten.
v4: Addressed Chris and Ville's review comments, and created a common colorspace property for DP and HDMI, filtered the list based on the colorspaces supported by the respective protocol standard. Handle the default case properly.
v5: Merged the DP handling along with platform colorspace handling as per Shashank's comments.
v6: Reverted to old design of exposing all colorspaces to userspace as per Ville's review comment
v7: Fixed a checkpatch complaint, Addressed Maarten' review comment, updated the RB from Maarten and Jani's ack.
Signed-off-by Uma Shankar <[email protected]>Acked-by Jani Nikula <[email protected]>Reviewed-by Maarten Lankhorst <[email protected]>--- 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 | 25 +++++++++++++++++++++++++ 4 files changed, 35 insertions(+)drivers/gpu/drm/i915/intel_atomic.c +0
-0@@ -124,6 +124,7 @@ int intel_digital_connector_atomic_check(struct
drm_connector*conn,drivers/gpu/drm/i915/intel_connector.c int intel_ddc_get_modes(struct drm_connector
Quoted 18 lines
drivers/gpu/drm/i915/intel_atomic.c +0
-0*/ if (new_conn_state->force_audio != old_conn_state->force_audio || new_conn_state->broadcast_rgb != old_conn_state->broadcast_rgb||
drivers/gpu/drm/i915/intel_atomic.c +2
-0+ new_conn_state->base.colorspace != +old_conn_state->base.colorspace || new_conn_state->base.picture_aspect_ratio != old_conn_state-base.picture_aspect_ratio ||
new_conn_state->base.content_type!= old_conn_state-
base.content_type ||
new_conn_state->base.scaling_mode!=old_conn_state->base.scaling_mode)drivers/gpu/drm/i915/intel_connector.c +0
-0@@ -265,3 +265,11 @@ int intel_ddc_get_modes(struct drm_connector*connector,
drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_set_avi_infoframe(struct
Quoted 31 lines
drivers/gpu/drm/i915/intel_connector.c +6
-0connector->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 +0
-0@@ -1783,6 +1783,7 @@ int intel_connector_update_modes(struct
drm_connector*connector, voidintel_attach_force_audio_property(struct drm_connector *connector); voidintel_attach_broadcast_rgb_property(struct drm_connector *connector); voidintel_attach_aspect_ratio_property(struct drm_connector *connector);drivers/gpu/drm/i915/intel_drv.h +2
-0+void intel_attach_colorspace_property (struct drm_connector +*connector);/* intel_csr.c */ void intel_csr_ucode_init(struct drm_i915_private *); diff --git
a/drivers/gpu/drm/i915/intel_hdmi.cb/drivers/gpu/drm/i915/intel_hdmi.c
index 97a98e1..5c5009d 100644drivers/gpu/drm/i915/intel_hdmi.c +0
-0@@ -498,6 +498,24 @@ static void intel_hdmi_set_avi_infoframe(struct
intel_encoder*encoder,
Quoted 8 lines
drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder, · line 503
Quoted 6 lines
drivers/gpu/drm/i915/intel_hdmi.c +3
-0else frame.avi.colorspace =HDMI_COLORSPACE_RGB ; +if (conn_state->colorspace ==DRM_MODE_COLORIMETRY_DEFAULT ) { +/* Set ITU 709 as default for HDMI */ + frame.avi.colorimetry =DRM_MODE_COLORIMETRY_ITU_709 ;Default should map to NONE.
Ok, I will make it NO DATA i.e. 0 for DEFAULT.
Quoted 19 lines
drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_set_avi_infoframe(struct · line 504
Quoted 2 lines
drivers/gpu/drm/i915/intel_hdmi.c +1
-0+ } else if (conn_state->colorspace <
DRM_MODE_COLORIMETRY_XV_YCC_601) {drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder, · line 517
Quoted 13 lines
drivers/gpu/drm/i915/intel_hdmi.c +13
-0+ frame.avi.colorimetry = conn_state->colorspace; + }else { + frame.avi.colorimetry =HDMI_COLORIMETRY_EXTENDED ; +/* +* Starting from extended list where COLORIMETRY_XV_YCC_601 +* is the first extended mode and its value is 0 as per HDMI +* specification. +* TODO: This needs to be extended for LSPCON implementation +* as well. Will be implemented separately. +*/ + frame.avi.extended_colorimetry = conn_state->colorspace - +DRM_MODE_COLORIMETRY_XV_YCC_601 ; + }This code seems like something that should be in the core.
Quoted 5 lines
Like said earlier maybe we could just directly map the values to these bits, and then this should just become
if.colorimetry = val &
0x3;
if.extended_colorimetry = (val >> 2) &0x7; if.ace = (val >> 5) &0xf;
Ok, will modify along these lines.
Quoted 1 line
Hmm, looks like
hdmi.hdoesn't even know about the ACE bits yet :(
:)
Thanks Ville for all your comments and suggestion.
Regards,
Uma Shankar
Quoted 32 lines
Quoted 12 lines
drivers/gpu/drm/i915/intel_hdmi.c +1
-0+ drm_hdmi_avi_infoframe_quant_range(&frame.avi, conn_state->connector, adjusted_mode,@@ -2143,10 +2161,17 @@ static void intel_hdmi_destroy(struct
drm_connector*connector)intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *connector){drivers/gpu/drm/i915/intel_hdmi.c +2
-0struct drm_i915_private *dev_priv =to_i915 (connector->dev); +struct intel_digital_port *intel_dig_port = +hdmi_to_dig_port (intel_hdmi);drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_destroy(struct drm_connector *connector)
Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +5
-0intel_attach_force_audio_property (connector);intel_attach_broadcast_rgb_property (connector);intel_attach_aspect_ratio_property (connector); + +/* Attach Colorspace property for Non LSPCON based device */ +if (!intel_dig_port->lspcon.active) +intel_attach_colorspace_property (connector); +drm_connector_attach_content_type_property (connector); connector->state->picture_aspect_ratio =
HDMI_PICTURE_ASPECT_NONE;Quoted 8 lines
--
1.9.1_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 lines
--
Ville Syrjälä
Intel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [v10 3/3] drm/i915: Attach colorspace property and enable modeset
Quoted 156 lines
-----Original Message-----
From: Shankar, Uma
Sent: Monday, February 4, 2019 10:49 PM
To: Ville Syrjälä <[email protected]>
Cc: [email protected]; Syrjala, Ville <[email protected]>; Lankhorst, Maarten <[email protected]>; dri- [email protected]
Subject: RE: [Intel-gfx] [v10 3/3] drm/i915: Attach colorspace property and enable modesetQuoted 112 lines
-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Ville Syrjälä
Sent: Saturday, February 2, 2019 12:31 AM
To: Shankar, Uma <[email protected]>
Cc: [email protected]; Syrjala, Ville <[email protected]>; Lankhorst, Maarten <[email protected]>; dri- [email protected]
Subject: Re: [Intel-gfx] [v10 3/3] drm/i915: Attach colorspace property and enable modesetdrivers/gpu/drm/i915/intel_atomic.c int intel_digital_connector_atomic_check(struct
Quoted 48 lines · Uma Shankar
This patch attaches the colorspace connector property to the hdmi connector. Based on colorspace change, modeset will be triggered to switch to new colorspace.
Based on colorspace property value create an infoframe with appropriate colorspace. This can be used to send an infoframe packet with proper colorspace value set which will help to enable wider color gamut like BT2020 on sink.
This patch attaches and enables HDMI colorspace, DP will be taken care separately.
v2: Merged the changes of creating infoframe as well to this patch as per Maarten's suggestion.
v3: Addressed review comments from Shashank. Separated HDMI and DP colorspaces as suggested by Ville and Maarten.
v4: Addressed Chris and Ville's review comments, and created a common colorspace property for DP and HDMI, filtered the list based on the colorspaces supported by the respective protocol standard. Handle the default case properly.
v5: Merged the DP handling along with platform colorspace handling as per Shashank's comments.
v6: Reverted to old design of exposing all colorspaces to userspace as per Ville's review comment
v7: Fixed a checkpatch complaint, Addressed Maarten' review comment, updated the RB from Maarten and Jani's ack.
Signed-off-by Uma Shankar <[email protected]>Acked-by Jani Nikula <[email protected]>Reviewed-by Maarten Lankhorst <[email protected]>--- 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 | 25 +++++++++++++++++++++++++ 4 files changed, 35 insertions(+)drivers/gpu/drm/i915/intel_atomic.c +0
-0@@ -124,6 +124,7 @@ int intel_digital_connector_atomic_check(struct
drm_connector*conn,drivers/gpu/drm/i915/intel_connector.c int intel_ddc_get_modes(struct drm_connector
Quoted 18 lines
drivers/gpu/drm/i915/intel_atomic.c +0
-0*/ if (new_conn_state->force_audio != old_conn_state->force_audio || new_conn_state->broadcast_rgb != old_conn_state->broadcast_rgb||
drivers/gpu/drm/i915/intel_atomic.c +2
-0+ new_conn_state->base.colorspace != +old_conn_state->base.colorspace || new_conn_state->base.picture_aspect_ratio != old_conn_state-base.picture_aspect_ratio ||
new_conn_state->base.content_type!= old_conn_state-
base.content_type ||
new_conn_state->base.scaling_mode!=old_conn_state->base.scaling_mode)drivers/gpu/drm/i915/intel_connector.c +0
-0@@ -265,3 +265,11 @@ int intel_ddc_get_modes(struct drm_connector*connector,
drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_set_avi_infoframe(struct
Quoted 31 lines
drivers/gpu/drm/i915/intel_connector.c +6
-0connector->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 +0
-0@@ -1783,6 +1783,7 @@ int intel_connector_update_modes(struct
drm_connector*connector, voidintel_attach_force_audio_property(struct drm_connector *connector); voidintel_attach_broadcast_rgb_property(struct drm_connector *connector); voidintel_attach_aspect_ratio_property(struct drm_connector *connector);drivers/gpu/drm/i915/intel_drv.h +2
-0+void intel_attach_colorspace_property (struct drm_connector +*connector);/* intel_csr.c */ void intel_csr_ucode_init(struct drm_i915_private *); diff --git
a/drivers/gpu/drm/i915/intel_hdmi.cb/drivers/gpu/drm/i915/intel_hdmi.c
index 97a98e1..5c5009d 100644drivers/gpu/drm/i915/intel_hdmi.c +0
-0@@ -498,6 +498,24 @@ static void intel_hdmi_set_avi_infoframe(struct
intel_encoder*encoder,Quoted 8 lines
drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder, · line 503
Quoted 6 lines
drivers/gpu/drm/i915/intel_hdmi.c +3
-0else frame.avi.colorspace =HDMI_COLORSPACE_RGB ; +if (conn_state->colorspace ==DRM_MODE_COLORIMETRY_DEFAULT ) { +/* Set ITU 709 as default for HDMI */ + frame.avi.colorimetry =DRM_MODE_COLORIMETRY_ITU_709 ;Default should map to NONE.
Ok, I will make it NO DATA i.e. 0 for DEFAULT.
Quoted 19 lines
drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_set_avi_infoframe(struct · line 504
Quoted 2 lines
drivers/gpu/drm/i915/intel_hdmi.c +1
-0+ } else if (conn_state->colorspace <
DRM_MODE_COLORIMETRY_XV_YCC_601) {drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder, · line 517
Quoted 13 lines
drivers/gpu/drm/i915/intel_hdmi.c +13
-0+ frame.avi.colorimetry = conn_state->colorspace; + }else { + frame.avi.colorimetry =HDMI_COLORIMETRY_EXTENDED ; +/* +* Starting from extended list where COLORIMETRY_XV_YCC_601 +* is the first extended mode and its value is 0 as per HDMI +* specification. +* TODO: This needs to be extended for LSPCON implementation +* as well. Will be implemented separately. +*/ + frame.avi.extended_colorimetry = conn_state->colorspace - +DRM_MODE_COLORIMETRY_XV_YCC_601 ; + }This code seems like something that should be in the core.
Quoted 7 lines
Quoted 5 lines
Like said earlier maybe we could just directly map the values to these bits, and then this should just become
if.colorimetry = val &
0x3;
if.extended_colorimetry = (val >> 2) &0x7; if.ace = (val >> 5) &0xf;Ok, will modify along these lines.
On looking further, it feels to have the enum defined sequentially for userspace and then respective encoders taking care as per spec looks better. In the case here, both DP and HDMI share some colorspaces so we can't have a common value for both as far as infoframe programming is concerned. Also currently with ACE, total bits go to 9 for HDMI. Hence we need to have enum value going randomly from 0 to 512 which will look more like magic numbers to userspace.
Currently I have moved this to drm layer as you suggested, will send the next version with all your comments addressed. Planning to send separate series to handle ACE stuff in linux/hdmi and then extend this as well as part of that series. Hope this is ok.
Regards,
Uma Shankar
Quoted 47 lines
Quoted 1 line
Hmm, looks like
hdmi.hdoesn't even know about the ACE bits yet :(:)
Thanks Ville for all your comments and suggestion.
Regards,
Uma ShankarQuoted 39 lines
Quoted 12 lines
drivers/gpu/drm/i915/intel_hdmi.c +1
-0+ drm_hdmi_avi_infoframe_quant_range(&frame.avi, conn_state->connector, adjusted_mode,@@ -2143,10 +2161,17 @@ static void intel_hdmi_destroy(struct
drm_connector*connector)intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *connector){drivers/gpu/drm/i915/intel_hdmi.c +2
-0struct drm_i915_private *dev_priv =to_i915 (connector->dev); +struct intel_digital_port *intel_dig_port = +hdmi_to_dig_port (intel_hdmi);drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_destroy(struct drm_connector *connector)
Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +5
-0intel_attach_force_audio_property (connector);intel_attach_broadcast_rgb_property (connector);intel_attach_aspect_ratio_property (connector); + +/* Attach Colorspace property for Non LSPCON based device */ +if (!intel_dig_port->lspcon.active) +intel_attach_colorspace_property (connector); +drm_connector_attach_content_type_property (connector); connector->state->picture_aspect_ratio =
HDMI_PICTURE_ASPECT_NONE;Quoted 8 lines
--
1.9.1_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx--
Ville Syrjälä
Intel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Add Colorspace connector property interface (rev10)
In reply to Uma Shankar== Series Details ==
== Series Details ==
Series: Add Colorspace connector property interface (rev10)
URL : https://patchwork.freedesktop.org/series/47132/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5508 -> Patchwork_12087
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/47132/revisions/10/mbox/
Known issues
------------
Here are the changes found in Patchwork_12087 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: PASS -> FAIL [fdo#109485]
* igt@kms_flip@basic-flip-vs-modeset:
- fi-skl-6700hq: PASS -> DMESG-WARN [fdo#105998] +1
#### Possible fixes ####
* igt@kms_busy@basic-flip-a:
- fi-kbl-7567u: {SKIP} [fdo#109271] / [fdo#109278] -> PASS +2
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
- fi-kbl-7560u: INCOMPLETE [fdo#108767] -> PASS
* igt@prime_vgem@basic-fence-flip:
- fi-kbl-7500u: {SKIP} [fdo#109271] -> PASS +33
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#105998]: https://bugs.freedesktop.org/show_bug.cgi?id=105998
[fdo#108767]: https://bugs.freedesktop.org/show_bug.cgi?id=108767
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109485]: https://bugs.freedesktop.org/show_bug.cgi?id=109485
Participating hosts (45 -> 39)
------------------------------
Missing (6): fi-kbl-soraka fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-gdg-551 fi-byt-clapper
Build changes
-------------
* Linux: CI_DRM_5508 -> Patchwork_12087
CI_DRM_5508: 2621b0168c75d062f272dd50f5073ad35dfdd946 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4799: 4177d0d6a40fe96e3d859be0413bf66ef9a8a606 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12087: 8cffc8dcba5a656d621a2b614335b5abb1410f1f @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
8cffc8dcba5a drm/i915: Attach colorspace property and enable modeset a82fbbf3881e drm: Add DP colorspace property9a1100d27d47 drm: Add HDMI colorspace property
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12087/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for Add Colorspace connector property interface (rev10)
In reply to Uma Shankar== Series Details ==
== Series Details ==
Series: Add Colorspace connector property interface (rev10)
URL : https://patchwork.freedesktop.org/series/47132/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5508_full -> Patchwork_12087_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_12087_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_available_modes_crc@available_mode_test_crc:
- shard-glk: PASS -> FAIL [fdo#106641]
* igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-a:
- shard-snb: NOTRUN -> DMESG-WARN [fdo#107956]
* igt@kms_cursor_crc@cursor-256x256-onscreen:
- shard-apl: PASS -> FAIL [fdo#103232]
* igt@kms_cursor_crc@cursor-alpha-transparent:
- shard-snb: NOTRUN -> FAIL [fdo#109350]
* igt@kms_plane_multiple@atomic-pipe-b-tiling-none:
- shard-apl: PASS -> FAIL [fdo#103166]
* igt@kms_setmode@basic:
- shard-kbl: PASS -> FAIL [fdo#99912]
* igt@kms_universal_plane@universal-plane-pipe-c-functional:
- shard-glk: PASS -> FAIL [fdo#103166]
#### Possible fixes ####
* igt@kms_cursor_crc@cursor-128x128-onscreen:
- shard-apl: FAIL [fdo#103232] -> PASS +2
* igt@kms_flip@flip-vs-expired-vblank:
- shard-kbl: FAIL [fdo#102887] / [fdo#105363] -> PASS
* igt@kms_plane@pixel-format-pipe-c-planes:
- shard-glk: FAIL [fdo#103166] -> PASS +1
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-max:
- shard-glk: FAIL [fdo#108145] -> 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#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#106641]: https://bugs.freedesktop.org/show_bug.cgi?id=106641
[fdo#107956]: https://bugs.freedesktop.org/show_bug.cgi?id=107956
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109350]: https://bugs.freedesktop.org/show_bug.cgi?id=109350
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (7 -> 5)
------------------------------
Missing (2): shard-skl shard-iclb
Build changes
-------------
* Linux: CI_DRM_5508 -> Patchwork_12087
CI_DRM_5508: 2621b0168c75d062f272dd50f5073ad35dfdd946 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4799: 4177d0d6a40fe96e3d859be0413bf66ef9a8a606 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12087: 8cffc8dcba5a656d621a2b614335b5abb1410f1f @ 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_12087/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx