Add Colorspace connector property interface
Subsystems (3)
v9 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.
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 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for Add Colorspace connector property interface (rev9)
== Series Details ==
== Series Details ==
Series: Add Colorspace connector property interface (rev9)
URL : https://patchwork.freedesktop.org/series/47132/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
2966dae600a0 drm: Add HDMI colorspace property
-:159: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#159: FILE: drivers/gpu/drm/drm_connector.c:1607:
+ if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA ||
+ connector->connector_type == DRM_MODE_CONNECTOR_HDMIB) {-:160: CHECK:BRACES: Blank lines aren't necessary after an open brace '{' #160: FILE: drivers/gpu/drm/drm_connector.c:1608:
+ connector->connector_type == DRM_MODE_CONNECTOR_HDMIB) {
+
total: 0 errors, 0 warnings, 2 checks, 171 lines checked 058bb0ff8389 drm: Add DP colorspace property
-:60: CHECK:LINE_SPACING: Please don't use multiple blank lines #60: FILE: drivers/gpu/drm/drm_connector.c:875:
+
+
-:70: CHECK:BRACES: Blank lines aren't necessary after an open brace '{' #70: FILE: drivers/gpu/drm/drm_connector.c:1640:
+ connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) {
+
total: 0 errors, 0 warnings, 2 checks, 43 lines checked 7510be7c09f5 drm/i915: Attach colorspace property and enable modeset -:66: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #66: FILE: drivers/gpu/drm/i915/intel_connector.c:274:
+ drm_object_attach_property(&connector->base,
+ connector->colorspace_property, 0);
total: 0 errors, 0 warnings, 1 checks, 66 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v9 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.
--- drivers/gpu/drm/drm_atomic_uapi.c | 4 +++ drivers/gpu/drm/drm_connector.c | 73 +++++++++++++++++++++++++++++++++++++++ include/drm/drm_connector.h | 46 ++++++++++++++++++++++++ 3 files changed, 123 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 +73 -0
85 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
PATCH v9 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
--- 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 *
@@ -1612,6 +1635,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 ; } connector->colorspace_property = prop;
Signature · 6 lines
1.9.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v9 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: Addressed Maarten's review comment and limited this currently to non lspcon based devices.
v7: Reverted to old design of exposing all colorspaces to userspace as per Ville's review comment
--- 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_state->colorspace != old_state->colorspace || new_conn_state->base.picture_aspect_ratio != old_conn_state->base.picture_aspect_ratio || new_conn_state->base.content_type != old_conn_state->base.content_type || new_conn_state->base.scaling_mode != old_conn_state->base.scaling_mode)
drivers/gpu/drm/i915/intel_connector.c +8 -0
@@ -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 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [v9 3/3] drm/i915: Attach colorspace property and enable modeset
Op 29-01-2019 om 19:50 schreef Uma Shankar:
Quoted 45 lines
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: Addressed Maarten's review comment and limited this currently to non lspcon based devices.
v7: Reverted to old design of exposing all colorspaces to userspace as per Ville's review comment
Signed-off-by Uma Shankar <[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
drivers/gpu/drm/i915/intel_atomic.c int intel_digital_connector_atomic_check(struct drm_connector *conn, · line 127
Quoted 4 lines
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_state->colorspace != old_state->colorspace ||
I only care if there's a new version, but can you use xxx_conn_state->base ?
Can fixup if patch is ready otherwise.
Otherwise series looks good, so
Quoted 68 lines
drivers/gpu/drm/i915/intel_atomic.c +0
-0new_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 +20
-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);
drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_destroy(struct drm_connector *connector) · line 2177
Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +5
-0intel_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 ;
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [v9 3/3] drm/i915: Attach colorspace property and enable modeset
Quoted 68 lines
-----Original Message-----
From: dri-devel [mailto:[email protected]] On Behalf Of Maarten Lankhorst
Sent: Wednesday, January 30, 2019 3:27 PM
To: Shankar, Uma <[email protected]>; [email protected]; [email protected]
Cc: [email protected]; Syrjala, Ville <[email protected]>; Lankhorst, Maarten <[email protected]>
Subject: Re: [v9 3/3] drm/i915: Attach colorspace property and enable modesetOp 29-01-2019 om 19:50 schreef Uma Shankar:
drivers/gpu/drm/i915/intel_atomic.c int intel_digital_connector_atomic_check(struct
Quoted 46 lines
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: Addressed Maarten's review comment and limited this currently to non lspcon based devices.
v7: Reverted to old design of exposing all colorspaces to userspace as per Ville's review comment
Signed-off-by Uma Shankar <[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_atomic.c int intel_digital_connector_atomic_check(struct drm_connector *conn, · line 127
Quoted 5 lines
drivers/gpu/drm/i915/intel_atomic.c +0
-0*/ if (new_conn_state->force_audio != old_conn_state->force_audio || new_conn_state->broadcast_rgb != old_conn_state->broadcast_rgb||
drivers/gpu/drm/i915/intel_atomic.c +1
-0+ new_state->colorspace != old_state->colorspace ||I only care if there's a new version, but can you use
xxx_conn_state->base?
Quoted 1 line
Can fixup if patch is ready otherwise.
Sure, I can fix this. Will send out the next version along with your RB and Jani's ack.
Thanks for the review.
Regards,
Uma Shankar
Quoted 97 lines
Otherwise series looks good, so
Reviewed-by Maarten Lankhorst <[email protected]> for thewhole series. :)
drivers/gpu/drm/i915/intel_connector.c int intel_ddc_get_modes(struct drm_connector
Quoted 12 lines
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,drivers/gpu/drm/i915/intel_hdmi.c static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder,
Quoted 7 lines
drivers/gpu/drm/i915/intel_hdmi.c +4
-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 ; + } else if (conn_state->colorspace <
DRM_MODE_COLORIMETRY_XV_YCC_601) {Quoted 24 lines
drivers/gpu/drm/i915/intel_hdmi.c +14
-0+ frame.avi.colorimetry = conn_state->colorspace; + }else { + frame.avi.colorimetry =HDMI_COLORIMETRY_EXTENDED ; +/* +* Starting from extended list where COLORIMETRY_XV_YCC_601 +* is the first extended mode and its value is 0 as per HDMI +* specification. +* TODO: This needs to be extended for LSPCON implementation +* as well. Will be implemented separately. +*/ + frame.avi.extended_colorimetry = conn_state->colorspace - +DRM_MODE_COLORIMETRY_XV_YCC_601 ; + } + drm_hdmi_avi_infoframe_quant_range(&frame.avi, conn_state->connector, adjusted_mode,@@ -2143,10 +2161,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 1 line
Quoted 4 lines
_______________________________________________
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.SPARSE: warning for Add Colorspace connector property interface (rev9)
In reply to Uma Shankar== Series Details ==
== Series Details ==
Series: Add Colorspace connector property interface (rev9)
URL : https://patchwork.freedesktop.org/series/47132/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Sparse version: v0.5.2 Commit: drm: Add HDMI colorspace property + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~ + connector->colorspace_property = prop; +drivers/gpu/drm/drm_connector.c:1617:33: warning: ‘prop’ may be used uninitialized in this function [-Wmaybe-uninitialized] +drivers/gpu/drm/drm_connector.c: In function ‘drm_mode_create_colorspace_property’:
Commit: drm: Add DP colorspace property
-O:drivers/gpu/drm/drm_connector.c:1617:33: warning: ‘prop’ may be used uninitialized in this function [-Wmaybe-uninitialized] +drivers/gpu/drm/drm_connector.c:1648:33: warning: ‘prop’ may be used uninitialized in this function [-Wmaybe-uninitialized]
Commit: drm/i915: Attach colorspace property and enable modeset Okay!
_______________________________________________
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 (rev9)
In reply to Uma Shankar== Series Details ==
== Series Details ==
Series: Add Colorspace connector property interface (rev9)
URL : https://patchwork.freedesktop.org/series/47132/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5501 -> Patchwork_12077
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/47132/revisions/9/mbox/
Known issues
------------
Here are the changes found in Patchwork_12077 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_busy@basic-flip-a:
- fi-gdg-551: NOTRUN -> FAIL [fdo#103182]
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a:
- fi-byt-clapper: PASS -> FAIL [fdo#107362]
#### Possible fixes ####
* igt@i915_module_load@reload-with-fault-injection:
- fi-kbl-7567u: DMESG-WARN [fdo#105602] / [fdo#108529] -> PASS +1
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-kbl-7567u: DMESG-FAIL [fdo#105079] -> PASS
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-b-frame-sequence:
- fi-byt-clapper: FAIL [fdo#103191] / [fdo#107362] -> PASS +1
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-c:
- fi-kbl-7567u: {SKIP} [fdo#109271] -> PASS +33
* igt@pm_rpm@module-reload:
- fi-kbl-7567u: DMESG-WARN [fdo#108529] -> PASS
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103182]: https://bugs.freedesktop.org/show_bug.cgi?id=103182
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#105079]: https://bugs.freedesktop.org/show_bug.cgi?id=105079
[fdo#105602]: https://bugs.freedesktop.org/show_bug.cgi?id=105602
[fdo#107362]: https://bugs.freedesktop.org/show_bug.cgi?id=107362
[fdo#108529]: https://bugs.freedesktop.org/show_bug.cgi?id=108529
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#108915]: https://bugs.freedesktop.org/show_bug.cgi?id=108915
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
Participating hosts (46 -> 39)
------------------------------
Additional (2): fi-icl-y fi-gdg-551
Missing (9): fi-kbl-soraka fi-hsw-4770r fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-glk-j4005 fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_5501 -> Patchwork_12077
CI_DRM_5501: 5aac0b69f3a3085b9b8a9924cb19cb94f7860dbe @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4798: 998e0a4aedf10fb5f7c271018cd80d874668bf55 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12077: 7510be7c09f566b5f28a08a54789ef421f13964a @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
7510be7c09f5 drm/i915: Attach colorspace property and enable modeset 058bb0ff8389 drm: Add DP colorspace property2966dae600a0 drm: Add HDMI colorspace property
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12077/
_______________________________________________
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 (rev9)
In reply to Uma Shankar== Series Details ==
== Series Details ==
Series: Add Colorspace connector property interface (rev9)
URL : https://patchwork.freedesktop.org/series/47132/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5501_full -> Patchwork_12077_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_12077_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_eio@reset-stress:
- shard-snb: PASS -> INCOMPLETE [fdo#105411]
* igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-b:
- shard-snb: NOTRUN -> DMESG-WARN [fdo#107956]
* igt@kms_color@pipe-b-degamma:
- shard-apl: PASS -> FAIL [fdo#104782]
* igt@kms_cursor_crc@cursor-128x128-random:
- shard-apl: PASS -> FAIL [fdo#103232]
* igt@kms_cursor_crc@cursor-64x21-onscreen:
- shard-glk: PASS -> FAIL [fdo#103232] +1
* igt@kms_flip@basic-flip-vs-modeset:
- shard-hsw: PASS -> INCOMPLETE [fdo#103540]
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-max:
- shard-apl: PASS -> FAIL [fdo#108145]
* igt@kms_plane_multiple@atomic-pipe-a-tiling-none:
- shard-glk: PASS -> FAIL [fdo#103166] +1
* igt@kms_plane_multiple@atomic-pipe-b-tiling-yf:
- shard-apl: PASS -> FAIL [fdo#103166]
* igt@kms_rotation_crc@multiplane-rotation:
- shard-glk: PASS -> DMESG-FAIL [fdo#105763] / [fdo#106538]
* igt@kms_setmode@basic:
- shard-kbl: PASS -> FAIL [fdo#99912]
#### Possible fixes ####
* igt@kms_busy@extended-modeset-hang-newfb-render-b:
- shard-snb: DMESG-WARN [fdo#107956] -> PASS
* igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-a:
- shard-kbl: DMESG-WARN [fdo#107956] -> PASS
* igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-c:
- shard-hsw: DMESG-WARN [fdo#107956] -> PASS
* igt@kms_color@pipe-b-ctm-max:
- shard-apl: FAIL [fdo#108147] -> PASS
* igt@kms_cursor_crc@cursor-256x256-random:
- shard-glk: FAIL [fdo#103232] -> PASS +1
* igt@kms_cursor_crc@cursor-64x21-random:
- shard-apl: FAIL [fdo#103232] -> PASS +1
* igt@kms_flip@flip-vs-expired-vblank:
- shard-glk: FAIL [fdo#102887] / [fdo#105363] -> PASS
* igt@kms_plane_multiple@atomic-pipe-b-tiling-x:
- shard-apl: FAIL [fdo#103166] -> PASS
* igt@kms_plane_multiple@atomic-pipe-c-tiling-x:
- shard-glk: FAIL [fdo#103166] -> PASS
* igt@prime_busy@hang-bsd:
- shard-hsw: FAIL [fdo#108807] -> 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#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#104782]: https://bugs.freedesktop.org/show_bug.cgi?id=104782
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
[fdo#105763]: https://bugs.freedesktop.org/show_bug.cgi?id=105763
[fdo#106538]: https://bugs.freedesktop.org/show_bug.cgi?id=106538
[fdo#107956]: https://bugs.freedesktop.org/show_bug.cgi?id=107956
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108147]: https://bugs.freedesktop.org/show_bug.cgi?id=108147
[fdo#108807]: https://bugs.freedesktop.org/show_bug.cgi?id=108807
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[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_5501 -> Patchwork_12077
CI_DRM_5501: 5aac0b69f3a3085b9b8a9924cb19cb94f7860dbe @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4798: 998e0a4aedf10fb5f7c271018cd80d874668bf55 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12077: 7510be7c09f566b5f28a08a54789ef421f13964a @ 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_12077/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx