Add Colorspace connector property interface
Subsystems (3)
v15 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.
v11: Addressed Ville's review comments. Modified MACRO names, added infoframe helper for colorspace to drm layer. Added DCI-P3 colorspace macro definitions defined in CTA 861.G. Currently linux/hdmi lacks support for ACE formats, will be added as a separate series.
v12: Exported the helper API.
v13: As per Ville's suggestion, added separate CTA 861.G spec defined HDMI specific macros. This is separate from user exposed enum values. Fixed some macro naming inconsistencies.
v14: Appended BT709 and SMPTE 170M with YCC information as per Ville's review comment to be clear and not to be confused with RGB. Added a check to allow only RGB colorspaces to be set in infoframe through the colorspace property, since there is no output csc property to control planar formats and it will be added later.
v15: Fixed an error in one of the if check.
Uma Shankar (4):
drm: Add HDMI colorspace property
drm: Add DP colorspace property
drm: Add colorspace info to AVI Infoframe 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/drm_edid.c | 57 ++++++++++++++++++ drivers/gpu/drm/i915/intel_atomic.c | 24 ++++++++ drivers/gpu/drm/i915/intel_connector.c | 8 +++ drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_hdmi.c | 13 +++++ include/drm/drm_connector.h | 69 ++++++++++++++++++++++ include/drm/drm_edid.h | 6 ++ 9 files changed, 286 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 (rev14)
== Series Details ==
== Series Details ==
Series: Add Colorspace connector property interface (rev14)
URL : https://patchwork.freedesktop.org/series/47132/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 15e6383fc8d1 drm: Add HDMI colorspace property 8efb8eb9d670 drm: Add DP colorspace property 6e30717d3a6c drm: Add colorspace info to AVI Infoframe 0dfba1c23ddb drm/i915: Attach colorspace property and enable modeset -:87: CHECK:UNNECESSARY_PARENTHESES: Unnecessary parentheses around 'new_conn_state->base.colorspace != DRM_MODE_COLORIMETRY_DEFAULT' #87: FILE: drivers/gpu/drm/i915/intel_atomic.c:140: + if ((new_conn_state->base.colorspace != DRM_MODE_COLORIMETRY_DEFAULT) || + !check_colorspace_is_rgb(new_conn_state->base.colorspace))
total: 0 errors, 0 warnings, 1 checks, 89 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v15 1/4 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.
v11: Addressed Ville's review comments. Updated the Macro naming and added DCI-P3 colorspace as well, defined in CTA 861.G spec.
v12: Appended BT709 and SMPTE 170M with YCC information as per Ville's review comment to be clear and not to be confused with RGB.
--- drivers/gpu/drm/drm_atomic_uapi.c | 4 ++ drivers/gpu/drm/drm_connector.c | 78 +++++++++++++++++++++++++++++++++++++++ include/drm/drm_connector.h | 49 ++++++++++++++++++++++++ 3 files changed, 131 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 +78 -0
90 lines not on this page · raw message
include/drm/drm_connector.h +49 -0
73 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v15 2/4 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.
v8: Addressed Ville's review comments and updated the colorspace macro definitions.
--- drivers/gpu/drm/drm_connector.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
drivers/gpu/drm/drm_connector.c +26 -0
@@ -853,6 +853,24 @@ int drm_display_info_set_bus_formats(struct drm_display_info *info, { DRM_MODE_COLORIMETRY_DCI_P3_RGB_THEATER, "DCI-P3_RGB_Theater" }, }; +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 IEC 61966-2-4 */ + {DRM_MODE_COLORIMETRY_XVYCC_601 ,"XVYCC_601" }, +/* High Definition Colorimetry based on IEC 61966-2-4 */ + {DRM_MODE_COLORIMETRY_XVYCC_709 ,"XVYCC_709" }, +/* Colorimetry based on IEC 61966-2-5 */ + {DRM_MODE_COLORIMETRY_OPRGB ,"opRGB" }, + {DRM_MODE_COLORIMETRY_DCI_P3_RGB_D65 ,"DCI-P3_RGB_D65" }, +/* DP MSA Colorimetry */ + {DRM_MODE_DP_COLORIMETRY_BT601_YCC ,"BT601_YCC" }, + {DRM_MODE_DP_COLORIMETRY_BT709_YCC ,"BT709_YCC" }, + {DRM_MODE_DP_COLORIMETRY_SRGB ,"sRGB" }, + {DRM_MODE_DP_COLORIMETRY_RGB_WIDE_GAMUT ,"RGB Wide Gamut" }, + {DRM_MODE_DP_COLORIMETRY_SCRGB ,"scRGB" }, +}; +/** * DOC: standard connector properties *
@@ -1614,6 +1632,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
PATCH v15 3/4 drm: Add colorspace info to AVI Infoframe
In reply to Uma ShankarThis adds colorspace information to HDMI AVI infoframe. A helper function is added to program the same.
v2: Moved this to drm core instead of i915 driver.
v3: Exported the helper function.
v4: Added separate HDMI specific macro as per CTA spec. This is separate from user exposed enum values. This is as per Ville's suggestion.
v5: Appended BT709 and SMPTE 170M with YCC information as per Ville's review comment to be clear and not to be confused with RGB.
--- drivers/gpu/drm/drm_edid.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ include/drm/drm_connector.h | 20 ++++++++++++++++ include/drm/drm_edid.h | 6 +++++ 3 files changed, 83 insertions(+)
drivers/gpu/drm/drm_edid.c +57 -0
@@ -4925,6 +4925,63 @@ static bool is_hdmi2_sink(struct drm_connector *connector)EXPORT_SYMBOL (drm_hdmi_avi_infoframe_from_display_mode);/** +* drm_hdmi_avi_infoframe_colorspace() - fill the HDMI AVI infoframe +* colorspace information +* @frame: HDMI AVI infoframe +* @conn_state: connector state +*/ +void +drm_hdmi_avi_infoframe_colorspace (struct hdmi_avi_infoframe *frame, +const struct drm_connector_state *conn_state) +{ +u32 colorimetry_val = conn_state->colorspace & +FULL_COLORIMETRY_MASK ; + +switch (colorimetry_val) { +case DRM_MODE_COLORIMETRY_NO_DATA : + colorimetry_val =HDMI_COLORIMETRY_NO_DATA ; +break ; +case HDMI_COLORIMETRY_SMPTE_170M_YCC : + colorimetry_val =HDMI_COLORIMETRY_SMPTE_170M_YCC ; +break ; +case DRM_MODE_COLORIMETRY_BT709_YCC : + colorimetry_val =HDMI_COLORIMETRY_BT709_YCC ; +break ; +case DRM_MODE_COLORIMETRY_XVYCC_601 : + colorimetry_val =HDMI_COLORIMETRY_XVYCC_601 ; +break ; +case DRM_MODE_COLORIMETRY_XVYCC_709 : + colorimetry_val =HDMI_COLORIMETRY_XVYCC_709 ; +break ; +case DRM_MODE_COLORIMETRY_SYCC_601 : + colorimetry_val =HDMI_COLORIMETRY_SYCC_601 ; +break ; +case DRM_MODE_COLORIMETRY_OPYCC_601 : + colorimetry_val =HDMI_COLORIMETRY_OPYCC_601 ; +break ; +case DRM_MODE_COLORIMETRY_OPRGB : + colorimetry_val =HDMI_COLORIMETRY_OPRGB ; +break ; +case DRM_MODE_COLORIMETRY_BT2020_RGB : +case DRM_MODE_COLORIMETRY_BT2020_YCC : + colorimetry_val =HDMI_COLORIMETRY_BT2020_RGB ; +break ; +case DRM_MODE_COLORIMETRY_BT2020_CYCC : + colorimetry_val =HDMI_COLORIMETRY_BT2020_CYCC ; +break ; +default : +/* ToDo: DCI-P3 will be handled as part of ACE enabling */ + colorimetry_val =HDMI_COLORIMETRY_NO_DATA ; +break ; + } + + frame->colorimetry = colorimetry_val &NORMAL_COLORIMETRY_MASK ; + frame->extended_colorimetry = (colorimetry_val >>2 ) & +EXTENDED_COLORIMETRY_MASK ; +} +EXPORT_SYMBOL (drm_hdmi_avi_infoframe_colorspace); + +/** * drm_hdmi_avi_infoframe_quant_range() - fill the HDMI AVI infoframe * quantization range information * @frame: HDMI AVI infoframe
include/drm/drm_connector.h +20 -0
@@ -288,6 +288,26 @@ enum drm_panel_orientation {#define DRM_MODE_DP_COLORIMETRY_RGB_WIDE_GAMUT 16#define DRM_MODE_DP_COLORIMETRY_SCRGB 17 +/* HDMI Colorspace Spec Definitions */ +#define FULL_COLORIMETRY_MASK 0x1FF +#define NORMAL_COLORIMETRY_MASK 0x3 +#define EXTENDED_COLORIMETRY_MASK 0x7 +#define EXTENDED_ACE_COLORIMETRY_MASK 0xF + +#define HDMI_COLORIMETRY_NO_DATA 0x0 +#define HDMI_COLORIMETRY_SMPTE_170M_YCC 0x1 +#define HDMI_COLORIMETRY_BT709_YCC 0x2 +#define HDMI_COLORIMETRY_XVYCC_601 0x3 +#define HDMI_COLORIMETRY_XVYCC_709 0x7 +#define HDMI_COLORIMETRY_SYCC_601 0xB +#define HDMI_COLORIMETRY_OPYCC_601 0xF +#define HDMI_COLORIMETRY_OPRGB 0x13 +#define HDMI_COLORIMETRY_BT2020_CYCC 0x17 +#define HDMI_COLORIMETRY_BT2020_RGB 0x1C +#define HDMI_COLORIMETRY_BT2020_YCC 0x1C +#define HDMI_COLORIMETRY_DCI_P3_RGB_D65 0x1F +#define HDMI_COLORIMETRY_DCI_P3_RGB_THEATER 0x3F +/** * struct drm_display_info - runtime data about the connected sink *
include/drm/drm_edid.h +6 -0
@@ -331,6 +331,7 @@ struct cea_sad {struct drm_encoder ;struct drm_connector ; +struct drm_connector_state ;struct drm_display_mode ;int drm_edid_to_sad (struct edid *edid,struct cea_sad **sads);
@@ -358,6 +359,11 @@ int drm_av_sync_delay(struct drm_connector *connector, drm_hdmi_vendor_infoframe_from_display_mode(struct hdmi_vendor_infoframe *frame, struct drm_connector *connector, const struct drm_display_mode *mode); + +void +drm_hdmi_avi_infoframe_colorspace (struct hdmi_avi_infoframe *frame, +const struct drm_connector_state *conn_state); + void drm_hdmi_avi_infoframe_quant_range(struct hdmi_avi_infoframe *frame, struct drm_connector *connector,
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [v15 3/4] drm: Add colorspace info to AVI Infoframe
Quoted 68 lines · Uma Shankar
This adds colorspace information to HDMI AVI infoframe. A helper function is added to program the same.
v2: Moved this to drm core instead of i915 driver.
v3: Exported the helper function.
v4: Added separate HDMI specific macro as per CTA spec. This is separate from user exposed enum values. This is as per Ville's suggestion.
v5: Appended BT709 and SMPTE 170M with YCC information as per Ville's review comment to be clear and not to be confused with RGB.
Signed-off-by Uma Shankar <[email protected]>--- drivers/gpu/drm/drm_edid.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ include/drm/drm_connector.h | 20 ++++++++++++++++ include/drm/drm_edid.h | 6 +++++ 3 files changed, 83 insertions(+)drivers/gpu/drm/drm_edid.c +39
-0@@ -4925,6 +4925,63 @@ static bool is_hdmi2_sink(struct drm_connector *connector)EXPORT_SYMBOL (drm_hdmi_avi_infoframe_from_display_mode);/** +* drm_hdmi_avi_infoframe_colorspace() - fill the HDMI AVI infoframe +* colorspace information +* @frame: HDMI AVI infoframe +* @conn_state: connector state +*/ +void +drm_hdmi_avi_infoframe_colorspace (struct hdmi_avi_infoframe *frame, +const struct drm_connector_state *conn_state) +{ +u32 colorimetry_val = conn_state->colorspace & +FULL_COLORIMETRY_MASK ; + +switch (colorimetry_val) { +case DRM_MODE_COLORIMETRY_NO_DATA : + colorimetry_val =HDMI_COLORIMETRY_NO_DATA ; +break ; +case HDMI_COLORIMETRY_SMPTE_170M_YCC : + colorimetry_val =HDMI_COLORIMETRY_SMPTE_170M_YCC ; +break ; +case DRM_MODE_COLORIMETRY_BT709_YCC : + colorimetry_val =HDMI_COLORIMETRY_BT709_YCC ; +break ; +case DRM_MODE_COLORIMETRY_XVYCC_601 : + colorimetry_val =HDMI_COLORIMETRY_XVYCC_601 ; +break ; +case DRM_MODE_COLORIMETRY_XVYCC_709 : + colorimetry_val =HDMI_COLORIMETRY_XVYCC_709 ; +break ; +case DRM_MODE_COLORIMETRY_SYCC_601 : + colorimetry_val =HDMI_COLORIMETRY_SYCC_601 ; +break ; +case DRM_MODE_COLORIMETRY_OPYCC_601 : + colorimetry_val =HDMI_COLORIMETRY_OPYCC_601 ; +break ; +case DRM_MODE_COLORIMETRY_OPRGB : + colorimetry_val =HDMI_COLORIMETRY_OPRGB ; +break ; +case DRM_MODE_COLORIMETRY_BT2020_RGB : +case DRM_MODE_COLORIMETRY_BT2020_YCC :
drivers/gpu/drm/drm_edid.c static bool is_hdmi2_sink(struct drm_connector *connector) · line 4976
Quoted 10 lines
drivers/gpu/drm/drm_edid.c +10
-0+ colorimetry_val =HDMI_COLORIMETRY_BT2020_RGB ; +break ; +case DRM_MODE_COLORIMETRY_BT2020_CYCC : + colorimetry_val =HDMI_COLORIMETRY_BT2020_CYCC ; +break ; +default : +/* ToDo: DCI-P3 will be handled as part of ACE enabling */ + colorimetry_val =HDMI_COLORIMETRY_NO_DATA ; +break ; + }
A table would probably be prettier.
Quoted 26 lines
drivers/gpu/drm/drm_edid.c +8
-0+ + frame->colorimetry = colorimetry_val &NORMAL_COLORIMETRY_MASK ; + frame->extended_colorimetry = (colorimetry_val >>2 ) & +EXTENDED_COLORIMETRY_MASK ; +} +EXPORT_SYMBOL (drm_hdmi_avi_infoframe_colorspace); + +/** * drm_hdmi_avi_infoframe_quant_range() - fill the HDMI AVI infoframe * quantization range information * @frame: HDMI AVI infoframe include/drm/drm_connector.h +7
-0@@ -288,6 +288,26 @@ enum drm_panel_orientation {#define DRM_MODE_DP_COLORIMETRY_RGB_WIDE_GAMUT 16#define DRM_MODE_DP_COLORIMETRY_SCRGB 17 +/* HDMI Colorspace Spec Definitions */ +#define FULL_COLORIMETRY_MASK 0x1FF +#define NORMAL_COLORIMETRY_MASK 0x3 +#define EXTENDED_COLORIMETRY_MASK 0x7 +#define EXTENDED_ACE_COLORIMETRY_MASK 0xF + +#define HDMI_COLORIMETRY_NO_DATA 0x0
include/drm/drm_connector.h enum drm_panel_orientation { · line 307
Quoted 10 lines
include/drm/drm_connector.h +10
-0+#define HDMI_COLORIMETRY_SMPTE_170M_YCC 0x1 +#define HDMI_COLORIMETRY_BT709_YCC 0x2 +#define HDMI_COLORIMETRY_XVYCC_601 0x3 +#define HDMI_COLORIMETRY_XVYCC_709 0x7 +#define HDMI_COLORIMETRY_SYCC_601 0xB +#define HDMI_COLORIMETRY_OPYCC_601 0xF +#define HDMI_COLORIMETRY_OPRGB 0x13 +#define HDMI_COLORIMETRY_BT2020_CYCC 0x17 +#define HDMI_COLORIMETRY_BT2020_RGB 0x1C +#define HDMI_COLORIMETRY_BT2020_YCC 0x1C
Those should be 0x1b
I would have suggested something like:
#define C0(x) ((x) << 0)
#define C1(x) ((x) << 1)
#define EC0(x) ((x) << 2)
#define EC1(x) ((x) << 3)
etc.
to make it easier to cross check against the spec. Or if a define for each bit is too much maybe just something like:
#define C(x) ((x) << 0)
#define EC(x) ((x) << 2)
#define ACE(x) ((x) << 5)
One problem is namespace pollution though. But since these aren't used elsewhere we could move them into .c file instead. Or maybe we should stuff them into linux/hdmi.h and avoid the namespace pollution by C/EC/ACE by using an enum and undeffing the helper macros after the enum has been defined. The use of an enum would be in line with other stuff in hdmi.h.
Quoted 37 lines
include/drm/drm_connector.h +3
-0+#define HDMI_COLORIMETRY_DCI_P3_RGB_D65 0x1F +#define HDMI_COLORIMETRY_DCI_P3_RGB_THEATER 0x3F +/** * struct drm_display_info - runtime data about the connected sink * include/drm/drm_edid.h +6
-0@@ -331,6 +331,7 @@ struct cea_sad {struct drm_encoder ;struct drm_connector ; +struct drm_connector_state ;struct drm_display_mode ;int drm_edid_to_sad (struct edid *edid,struct cea_sad **sads);@@ -358,6 +359,11 @@ int drm_av_sync_delay(struct drm_connector *connector, drm_hdmi_vendor_infoframe_from_display_mode(struct hdmi_vendor_infoframe *frame, struct drm_connector *connector, const struct drm_display_mode *mode); + +void +drm_hdmi_avi_infoframe_colorspace (struct hdmi_avi_infoframe *frame, +const struct drm_connector_state *conn_state); + void drm_hdmi_avi_infoframe_quant_range(struct hdmi_avi_infoframe *frame, struct drm_connector *connector,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: [v15 3/4] drm: Add colorspace info to AVI Infoframe
Quoted 84 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Tuesday, February 12, 2019 10:35 PM
To: Shankar, Uma <[email protected]>
Cc: [email protected]; [email protected]; Syrjala, Ville <[email protected]>; [email protected]; Lankhorst, Maarten <[email protected]>
Subject: Re: [v15 3/4] drm: Add colorspace info to AVI InfoframeQuoted 72 lines · Uma Shankar
This adds colorspace information to HDMI AVI infoframe. A helper function is added to program the same.
v2: Moved this to drm core instead of i915 driver.
v3: Exported the helper function.
v4: Added separate HDMI specific macro as per CTA spec. This is separate from user exposed enum values. This is as per Ville's suggestion.
v5: Appended BT709 and SMPTE 170M with YCC information as per Ville's review comment to be clear and not to be confused with RGB.
Signed-off-by Uma Shankar <[email protected]>--- drivers/gpu/drm/drm_edid.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ include/drm/drm_connector.h | 20 ++++++++++++++++ include/drm/drm_edid.h | 6 +++++ 3 files changed, 83 insertions(+)drivers/gpu/drm/drm_edid.c +42
-0@@ -4925,6 +4925,63 @@ static bool is_hdmi2_sink(struct drm_connector *connector) EXPORT_SYMBOL(drm_hdmi_avi_infoframe_from_display_mode);/** +* drm_hdmi_avi_infoframe_colorspace() - fill the HDMI AVI infoframe +* colorspace information +* @frame: HDMI AVI infoframe +* @conn_state: connector state +*/ +void +drm_hdmi_avi_infoframe_colorspace (struct hdmi_avi_infoframe *frame, +const struct drm_connector_state *conn_state) { +u32 colorimetry_val = conn_state->colorspace & +FULL_COLORIMETRY_MASK ; + +switch (colorimetry_val) { +case DRM_MODE_COLORIMETRY_NO_DATA : + colorimetry_val =HDMI_COLORIMETRY_NO_DATA ; +break ; +case HDMI_COLORIMETRY_SMPTE_170M_YCC : + colorimetry_val =HDMI_COLORIMETRY_SMPTE_170M_YCC ; +break ; +case DRM_MODE_COLORIMETRY_BT709_YCC : + colorimetry_val =HDMI_COLORIMETRY_BT709_YCC ; +break ; +case DRM_MODE_COLORIMETRY_XVYCC_601 : + colorimetry_val =HDMI_COLORIMETRY_XVYCC_601 ; +break ; +case DRM_MODE_COLORIMETRY_XVYCC_709 : + colorimetry_val =HDMI_COLORIMETRY_XVYCC_709 ; +break ; +case DRM_MODE_COLORIMETRY_SYCC_601 : + colorimetry_val =HDMI_COLORIMETRY_SYCC_601 ; +break ; +case DRM_MODE_COLORIMETRY_OPYCC_601 : + colorimetry_val =HDMI_COLORIMETRY_OPYCC_601 ; +break ; +case DRM_MODE_COLORIMETRY_OPRGB : + colorimetry_val =HDMI_COLORIMETRY_OPRGB ; +break ; +case DRM_MODE_COLORIMETRY_BT2020_RGB : +case DRM_MODE_COLORIMETRY_BT2020_YCC : + colorimetry_val =HDMI_COLORIMETRY_BT2020_RGB ; +break ; +case DRM_MODE_COLORIMETRY_BT2020_CYCC : + colorimetry_val =HDMI_COLORIMETRY_BT2020_CYCC ;
Quoted 8 lines
drivers/gpu/drm/drm_edid.c static bool is_hdmi2_sink(struct drm_connector *connector) · line 4976
Quoted 6 lines
drivers/gpu/drm/drm_edid.c +6
-0+break ; +default : +/* ToDo: DCI-P3 will be handled as part of ACE enabling */ + colorimetry_val =HDMI_COLORIMETRY_NO_DATA ; +break ; + }A table would probably be prettier.
Ok, I will add that as table.
Quoted 46 lines
Quoted 26 lines
drivers/gpu/drm/drm_edid.c +8
-0+ + frame->colorimetry = colorimetry_val &NORMAL_COLORIMETRY_MASK ; + frame->extended_colorimetry = (colorimetry_val >>2 ) & +EXTENDED_COLORIMETRY_MASK ; +} +EXPORT_SYMBOL (drm_hdmi_avi_infoframe_colorspace); + +/** * drm_hdmi_avi_infoframe_quant_range() - fill the HDMI AVI infoframe * quantization range information * @frame: HDMI AVI infoframe include/drm/drm_connector.h +7
-0@@ -288,6 +288,26 @@ enum drm_panel_orientation {#define DRM_MODE_DP_COLORIMETRY_RGB_WIDE_GAMUT 16#define DRM_MODE_DP_COLORIMETRY_SCRGB 17 +/* HDMI Colorspace Spec Definitions */ +#define FULL_COLORIMETRY_MASK 0x1FF +#define NORMAL_COLORIMETRY_MASK 0x3 +#define EXTENDED_COLORIMETRY_MASK 0x7 +#define EXTENDED_ACE_COLORIMETRY_MASK 0xF + +#define HDMI_COLORIMETRY_NO_DATA 0x0include/drm/drm_connector.h enum drm_panel_orientation { · line 307
Quoted 10 lines
include/drm/drm_connector.h +10
-0+#define HDMI_COLORIMETRY_SMPTE_170M_YCC 0x1 +#define HDMI_COLORIMETRY_BT709_YCC 0x2 +#define HDMI_COLORIMETRY_XVYCC_601 0x3 +#define HDMI_COLORIMETRY_XVYCC_709 0x7 +#define HDMI_COLORIMETRY_SYCC_601 0xB +#define HDMI_COLORIMETRY_OPYCC_601 0xF +#define HDMI_COLORIMETRY_OPRGB 0x13 +#define HDMI_COLORIMETRY_BT2020_CYCC 0x17 +#define HDMI_COLORIMETRY_BT2020_RGB 0x1C +#define HDMI_COLORIMETRY_BT2020_YCC 0x1CThose should be
0x1bI would have suggested something like:
#define C0(x) ((x) << 0)
#define C1(x) ((x) << 1)
#define EC0(x) ((x) << 2)
#define EC1(x) ((x) << 3)
etc.
Quoted 6 lines
to make it easier to cross check against the spec. Or if a define for each bit is too much maybe just something like:
#define C(x) ((x) << 0)
#define EC(x) ((x) << 2)
#define ACE(x) ((x) << 5)
This looks good, will modify as per this.
Quoted 5 lines
One problem is namespace pollution though. But since these aren't used elsewhere we could move them into .c file instead. Or maybe we should stuff them into
linux/hdmi.hand avoid the namespace pollution by C/EC/ACE by using an enum and undeffing the helper macros after the enum has been defined. The use of an enum would be in line with other stuff inhdmi.h.
Since no one else is supposed to be using this, should I just move it to the C file where we are using them to avoid any namespace issues as such. If that is fine, will send out the next version addressing all the comments.
Thanks Ville for the review and valuable inputs.
Regards,
Uma Shankar
Quoted 35 lines
Quoted 20 lines
include/drm/drm_connector.h +3
-0+#define HDMI_COLORIMETRY_DCI_P3_RGB_D65 0x1F +#define HDMI_COLORIMETRY_DCI_P3_RGB_THEATER 0x3F +/** * struct drm_display_info - runtime data about the connected sink * include/drm/drm_edid.h index renamed from include/drm/drm_edid.h +0
-08dc1a08..9d3b5b9 100644
include/drm/drm_edid.h +1
-1@@ -331,6 +331,7 @@ struct cea_sad {struct drm_encoder ;struct drm_connector ; +struct drm_connector_state ;struct drm_display_mode ; int drm_edid_to_sad(struct edid *edid, struct cea_sad **sads); @@ -358,6 +359,11 @@ int drm_av_sync_delay(struct drm_connectorQuoted 1 line
*connector, drm_hdmi_vendor_infoframe_from_display_mode(struct
hdmi_vendor_infoframe*frame,Quoted 13 lines
include/drm/drm_edid.h +5
-1struct drm_connector *connector, const struct drm_display_mode *mode); + +void +drm_hdmi_avi_infoframe_colorspace (struct hdmi_avi_infoframe *frame, +const struct drm_connector_state *conn_state); + void drm_hdmi_avi_infoframe_quant_range(struct hdmi_avi_infoframe *frame, struct drm_connector *connector, --1.9.1
Quoted 8 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
Re: [v15 3/4] drm: Add colorspace info to AVI Infoframe
Quoted 156 lines · Uma
Quoted 84 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Tuesday, February 12, 2019 10:35 PM
To: Shankar, Uma <[email protected]>
Cc: [email protected]; [email protected]; Syrjala, Ville <[email protected]>; [email protected]; Lankhorst, Maarten <[email protected]>
Subject: Re: [v15 3/4] drm: Add colorspace info to AVI InfoframeQuoted 72 lines · Uma Shankar
This adds colorspace information to HDMI AVI infoframe. A helper function is added to program the same.
v2: Moved this to drm core instead of i915 driver.
v3: Exported the helper function.
v4: Added separate HDMI specific macro as per CTA spec. This is separate from user exposed enum values. This is as per Ville's suggestion.
v5: Appended BT709 and SMPTE 170M with YCC information as per Ville's review comment to be clear and not to be confused with RGB.
Signed-off-by Uma Shankar <[email protected]>--- drivers/gpu/drm/drm_edid.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ include/drm/drm_connector.h | 20 ++++++++++++++++ include/drm/drm_edid.h | 6 +++++ 3 files changed, 83 insertions(+)drivers/gpu/drm/drm_edid.c +42
-0@@ -4925,6 +4925,63 @@ static bool is_hdmi2_sink(struct drm_connector *connector) EXPORT_SYMBOL(drm_hdmi_avi_infoframe_from_display_mode);/** +* drm_hdmi_avi_infoframe_colorspace() - fill the HDMI AVI infoframe +* colorspace information +* @frame: HDMI AVI infoframe +* @conn_state: connector state +*/ +void +drm_hdmi_avi_infoframe_colorspace (struct hdmi_avi_infoframe *frame, +const struct drm_connector_state *conn_state) { +u32 colorimetry_val = conn_state->colorspace & +FULL_COLORIMETRY_MASK ; + +switch (colorimetry_val) { +case DRM_MODE_COLORIMETRY_NO_DATA : + colorimetry_val =HDMI_COLORIMETRY_NO_DATA ; +break ; +case HDMI_COLORIMETRY_SMPTE_170M_YCC : + colorimetry_val =HDMI_COLORIMETRY_SMPTE_170M_YCC ; +break ; +case DRM_MODE_COLORIMETRY_BT709_YCC : + colorimetry_val =HDMI_COLORIMETRY_BT709_YCC ; +break ; +case DRM_MODE_COLORIMETRY_XVYCC_601 : + colorimetry_val =HDMI_COLORIMETRY_XVYCC_601 ; +break ; +case DRM_MODE_COLORIMETRY_XVYCC_709 : + colorimetry_val =HDMI_COLORIMETRY_XVYCC_709 ; +break ; +case DRM_MODE_COLORIMETRY_SYCC_601 : + colorimetry_val =HDMI_COLORIMETRY_SYCC_601 ; +break ; +case DRM_MODE_COLORIMETRY_OPYCC_601 : + colorimetry_val =HDMI_COLORIMETRY_OPYCC_601 ; +break ; +case DRM_MODE_COLORIMETRY_OPRGB : + colorimetry_val =HDMI_COLORIMETRY_OPRGB ; +break ; +case DRM_MODE_COLORIMETRY_BT2020_RGB : +case DRM_MODE_COLORIMETRY_BT2020_YCC : + colorimetry_val =HDMI_COLORIMETRY_BT2020_RGB ; +break ; +case DRM_MODE_COLORIMETRY_BT2020_CYCC : + colorimetry_val =HDMI_COLORIMETRY_BT2020_CYCC ;Quoted 8 lines
drivers/gpu/drm/drm_edid.c static bool is_hdmi2_sink(struct drm_connector *connector) · line 4976
Quoted 6 lines
drivers/gpu/drm/drm_edid.c +6
-0+break ; +default : +/* ToDo: DCI-P3 will be handled as part of ACE enabling */ + colorimetry_val =HDMI_COLORIMETRY_NO_DATA ; +break ; + }A table would probably be prettier.
Ok, I will add that as table.
Quoted 46 lines
Quoted 26 lines
drivers/gpu/drm/drm_edid.c +8
-0+ + frame->colorimetry = colorimetry_val &NORMAL_COLORIMETRY_MASK ; + frame->extended_colorimetry = (colorimetry_val >>2 ) & +EXTENDED_COLORIMETRY_MASK ; +} +EXPORT_SYMBOL (drm_hdmi_avi_infoframe_colorspace); + +/** * drm_hdmi_avi_infoframe_quant_range() - fill the HDMI AVI infoframe * quantization range information * @frame: HDMI AVI infoframe include/drm/drm_connector.h +7
-0@@ -288,6 +288,26 @@ enum drm_panel_orientation {#define DRM_MODE_DP_COLORIMETRY_RGB_WIDE_GAMUT 16#define DRM_MODE_DP_COLORIMETRY_SCRGB 17 +/* HDMI Colorspace Spec Definitions */ +#define FULL_COLORIMETRY_MASK 0x1FF +#define NORMAL_COLORIMETRY_MASK 0x3 +#define EXTENDED_COLORIMETRY_MASK 0x7 +#define EXTENDED_ACE_COLORIMETRY_MASK 0xF + +#define HDMI_COLORIMETRY_NO_DATA 0x0include/drm/drm_connector.h enum drm_panel_orientation { · line 307
Quoted 10 lines
include/drm/drm_connector.h +10
-0+#define HDMI_COLORIMETRY_SMPTE_170M_YCC 0x1 +#define HDMI_COLORIMETRY_BT709_YCC 0x2 +#define HDMI_COLORIMETRY_XVYCC_601 0x3 +#define HDMI_COLORIMETRY_XVYCC_709 0x7 +#define HDMI_COLORIMETRY_SYCC_601 0xB +#define HDMI_COLORIMETRY_OPYCC_601 0xF +#define HDMI_COLORIMETRY_OPRGB 0x13 +#define HDMI_COLORIMETRY_BT2020_CYCC 0x17 +#define HDMI_COLORIMETRY_BT2020_RGB 0x1C +#define HDMI_COLORIMETRY_BT2020_YCC 0x1CThose should be
0x1bI would have suggested something like:
#define C0(x) ((x) << 0)
#define C1(x) ((x) << 1)
#define EC0(x) ((x) << 2)
#define EC1(x) ((x) << 3)
etc.Quoted 6 lines
to make it easier to cross check against the spec. Or if a define for each bit is too much maybe just something like:
#define C(x) ((x) << 0)
#define EC(x) ((x) << 2)
#define ACE(x) ((x) << 5)This looks good, will modify as per this.
Quoted 5 lines
One problem is namespace pollution though. But since these aren't used elsewhere we could move them into .c file instead. Or maybe we should stuff them into
linux/hdmi.hand avoid the namespace pollution by C/EC/ACE by using an enum and undeffing the helper macros after the enum has been defined. The use of an enum would be in line with other stuff inhdmi.h.
Quoted 3 lines
Since no one else is supposed to be using this, should I just move it to the C file where we are using them to avoid any namespace issues as such. If that is fine, will send out the next version addressing all the comments.
Yeah, I guess having it in the c file is fine. Someone can move it if they need it elsewhere.
Quoted 49 lines
Thanks Ville for the review and valuable inputs.
Regards,
Uma ShankarQuoted 43 lines
Quoted 20 lines
include/drm/drm_connector.h +3
-0+#define HDMI_COLORIMETRY_DCI_P3_RGB_D65 0x1F +#define HDMI_COLORIMETRY_DCI_P3_RGB_THEATER 0x3F +/** * struct drm_display_info - runtime data about the connected sink * include/drm/drm_edid.h index renamed from include/drm/drm_edid.h +0
-08dc1a08..9d3b5b9 100644
include/drm/drm_edid.h +1
-1@@ -331,6 +331,7 @@ struct cea_sad {struct drm_encoder ;struct drm_connector ; +struct drm_connector_state ;struct drm_display_mode ; int drm_edid_to_sad(struct edid *edid, struct cea_sad **sads); @@ -358,6 +359,11 @@ int drm_av_sync_delay(struct drm_connectorQuoted 1 line
*connector, drm_hdmi_vendor_infoframe_from_display_mode(struct
hdmi_vendor_infoframe*frame,Quoted 13 lines
include/drm/drm_edid.h +5
-1struct drm_connector *connector, const struct drm_display_mode *mode); + +void +drm_hdmi_avi_infoframe_colorspace (struct hdmi_avi_infoframe *frame, +const struct drm_connector_state *conn_state); + void drm_hdmi_avi_infoframe_quant_range(struct hdmi_avi_infoframe *frame, struct drm_connector *connector, --1.9.1
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel--
Ville Syrjälä
Intel
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [v15 3/4] drm: Add colorspace info to AVI Infoframe
Quoted 169 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Wednesday, February 13, 2019 4:34 PM
To: Shankar, Uma <[email protected]>
Cc: [email protected]; [email protected]; Syrjala, Ville <[email protected]>; [email protected]; Lankhorst, Maarten <[email protected]>
Subject: Re: [v15 3/4] drm: Add colorspace info to AVI InfoframeQuoted 143 lines · Uma
Quoted 86 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Tuesday, February 12, 2019 10:35 PM
To: Shankar, Uma <[email protected]>
Cc: [email protected]; [email protected]; Syrjala, Ville <[email protected]>; [email protected]; Lankhorst, Maarten <[email protected]>
Subject: Re: [v15 3/4] drm: Add colorspace info to AVI InfoframeQuoted 74 lines · Uma Shankar
This adds colorspace information to HDMI AVI infoframe. A helper function is added to program the same.
v2: Moved this to drm core instead of i915 driver.
v3: Exported the helper function.
v4: Added separate HDMI specific macro as per CTA spec. This is separate from user exposed enum values. This is as per Ville's suggestion.
v5: Appended BT709 and SMPTE 170M with YCC information as per Ville's review comment to be clear and not to be confused with RGB.
Signed-off-by Uma Shankar <[email protected]>--- drivers/gpu/drm/drm_edid.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ include/drm/drm_connector.h | 20 ++++++++++++++++ include/drm/drm_edid.h | 6 +++++ 3 files changed, 83 insertions(+)(quoted diff) +0
-0
b/drivers/gpu/drm/drm_edid.cindex 990b190..5202fea 100644drivers/gpu/drm/drm_edid.c +0
-0@@ -4925,6 +4925,63 @@ static bool is_hdmi2_sink(struct
drm_connector
*connector)EXPORT_SYMBOL(drm_hdmi_avi_infoframe_from_display_mode);/**
+ *drm_hdmi_avi_infoframe_colorspace()- fill the HDMI AVI infoframe
+ * colorspace information
+ * @frame: HDMI AVI infoframe
+ * @conn_state: connector state
+ */drivers/gpu/drm/drm_edid.c +37
-0+void +drm_hdmi_avi_infoframe_colorspace (struct hdmi_avi_infoframe *frame, +const struct drm_connector_state *conn_state) { +u32 colorimetry_val = conn_state->colorspace & +FULL_COLORIMETRY_MASK ; + +switch (colorimetry_val) { +case DRM_MODE_COLORIMETRY_NO_DATA : + colorimetry_val =HDMI_COLORIMETRY_NO_DATA ; +break ; +case HDMI_COLORIMETRY_SMPTE_170M_YCC : + colorimetry_val =HDMI_COLORIMETRY_SMPTE_170M_YCC ; +break ; +case DRM_MODE_COLORIMETRY_BT709_YCC : + colorimetry_val =HDMI_COLORIMETRY_BT709_YCC ; +break ; +case DRM_MODE_COLORIMETRY_XVYCC_601 : + colorimetry_val =HDMI_COLORIMETRY_XVYCC_601 ; +break ; +case DRM_MODE_COLORIMETRY_XVYCC_709 : + colorimetry_val =HDMI_COLORIMETRY_XVYCC_709 ; +break ; +case DRM_MODE_COLORIMETRY_SYCC_601 : + colorimetry_val =HDMI_COLORIMETRY_SYCC_601 ; +break ; +case DRM_MODE_COLORIMETRY_OPYCC_601 : + colorimetry_val =HDMI_COLORIMETRY_OPYCC_601 ; +break ; +case DRM_MODE_COLORIMETRY_OPRGB : + colorimetry_val =HDMI_COLORIMETRY_OPRGB ; +break ; +case DRM_MODE_COLORIMETRY_BT2020_RGB : +case DRM_MODE_COLORIMETRY_BT2020_YCC : + colorimetry_val =HDMI_COLORIMETRY_BT2020_RGB ; +break ; +case DRM_MODE_COLORIMETRY_BT2020_CYCC : + colorimetry_val =HDMI_COLORIMETRY_BT2020_CYCC ;Quoted 8 lines
drivers/gpu/drm/drm_edid.c static bool is_hdmi2_sink(struct drm_connector *connector) · line 4976
Quoted 6 lines
drivers/gpu/drm/drm_edid.c +6
-0+break ; +default : +/* ToDo: DCI-P3 will be handled as part of ACE enabling */ + colorimetry_val =HDMI_COLORIMETRY_NO_DATA ; +break ; + }A table would probably be prettier.
Ok, I will add that as table.
Quoted 46 lines
Quoted 26 lines
drivers/gpu/drm/drm_edid.c +8
-0+ + frame->colorimetry = colorimetry_val &NORMAL_COLORIMETRY_MASK ; + frame->extended_colorimetry = (colorimetry_val >>2 ) & +EXTENDED_COLORIMETRY_MASK ; +} +EXPORT_SYMBOL (drm_hdmi_avi_infoframe_colorspace); + +/** * drm_hdmi_avi_infoframe_quant_range() - fill the HDMI AVI infoframe * quantization range information * @frame: HDMI AVI infoframe (quoted diff) +0
-0
b/include/drm/drm_connector.hindex 4d9aa2f..efacf29 100644include/drm/drm_connector.h +7
-0@@ -288,6 +288,26 @@ enum drm_panel_orientation {#define DRM_MODE_DP_COLORIMETRY_RGB_WIDE_GAMUT 16#define DRM_MODE_DP_COLORIMETRY_SCRGB 17 +/* HDMI Colorspace Spec Definitions */ +#define FULL_COLORIMETRY_MASK 0x1FF +#define NORMAL_COLORIMETRY_MASK 0x3 +#define EXTENDED_COLORIMETRY_MASK 0x7 +#define EXTENDED_ACE_COLORIMETRY_MASK 0xF + +#define HDMI_COLORIMETRY_NO_DATA 0x0include/drm/drm_connector.h enum drm_panel_orientation { · line 307
Quoted 10 lines
include/drm/drm_connector.h +10
-0+#define HDMI_COLORIMETRY_SMPTE_170M_YCC 0x1 +#define HDMI_COLORIMETRY_BT709_YCC 0x2 +#define HDMI_COLORIMETRY_XVYCC_601 0x3 +#define HDMI_COLORIMETRY_XVYCC_709 0x7 +#define HDMI_COLORIMETRY_SYCC_601 0xB +#define HDMI_COLORIMETRY_OPYCC_601 0xF +#define HDMI_COLORIMETRY_OPRGB 0x13 +#define HDMI_COLORIMETRY_BT2020_CYCC 0x17 +#define HDMI_COLORIMETRY_BT2020_RGB 0x1C +#define HDMI_COLORIMETRY_BT2020_YCC 0x1CThose should be
0x1bI would have suggested something like:
#define C0(x) ((x) << 0)
#define C1(x) ((x) << 1)
#define EC0(x) ((x) << 2)
#define EC1(x) ((x) << 3)
etc.Quoted 14 lines
Quoted 6 lines
to make it easier to cross check against the spec. Or if a define for each bit is too much maybe just something like:
#define C(x) ((x) << 0)
#define EC(x) ((x) << 2)
#define ACE(x) ((x) << 5)This looks good, will modify as per this.
Quoted 5 lines
One problem is namespace pollution though. But since these aren't used elsewhere we could move them into .c file instead. Or maybe we should stuff them into
linux/hdmi.hand avoid the namespace pollution by C/EC/ACE by using an enum and undeffing the helper macros after the enum has been defined. The use of an enum would be in line with other stuff in
Quoted 8 lines
hdmi.h.Quoted 4 lines
Since no one else is supposed to be using this, should I just move it to the C file where we are using them to avoid any namespace issues as such. If that is fine, will send out the next version addressing all the comments.
Yeah, I guess having it in the c file is fine. Someone can move it if they need it elsewhere.
Hi Ville,
Thanks, I have floated the next version with all the comments addressed. Please check and approve if all looks ok.
Regards,
Uma Shankar
Quoted 50 lines
Quoted 49 lines
Thanks Ville for the review and valuable inputs.
Regards,
Uma ShankarQuoted 43 lines
Quoted 20 lines
include/drm/drm_connector.h +3
-0+#define HDMI_COLORIMETRY_DCI_P3_RGB_D65 0x1F +#define HDMI_COLORIMETRY_DCI_P3_RGB_THEATER 0x3F +/** * struct drm_display_info - runtime data about the connected sink * include/drm/drm_edid.h index renamed from include/drm/drm_edid.h +0
-08dc1a08..9d3b5b9 100644
include/drm/drm_edid.h +1
-1@@ -331,6 +331,7 @@ struct cea_sad {struct drm_encoder ;struct drm_connector ; +struct drm_connector_state ;struct drm_display_mode ; int drm_edid_to_sad(struct edid *edid, struct cea_sad **sads); @@ -358,6 +359,11 @@ int drm_av_sync_delay(struct drm_connectorQuoted 1 line
*connector, drm_hdmi_vendor_infoframe_from_display_mode(struct
hdmi_vendor_infoframe*frame,Quoted 13 lines
include/drm/drm_edid.h +5
-1struct drm_connector *connector, const struct drm_display_mode *mode); + +void +drm_hdmi_avi_infoframe_colorspace (struct hdmi_avi_infoframe *frame, +const struct drm_connector_state *conn_state); + void drm_hdmi_avi_infoframe_quant_range(struct hdmi_avi_infoframe *frame, struct drm_connector *connector, --1.9.1
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel--
Ville Syrjälä
Intel
Quoted 3 lines
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v15 4/4 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.
v8: Moved colorspace AVI Infoframe programming to drm core and removed from driver as per Ville's suggestion.
v9: Added a check to allow only RGB colorspaces to be set in infoframe through the colorspace property. Since there is no output csc property to control planar formats and it will be added later. Changes for RGB->YUV conversion inside driver without userspace knowledge is still supported. This is as per Ville's suggestion.
v10: Fixed an error in if check for rgb colorspace.
--- drivers/gpu/drm/i915/intel_atomic.c | 24 ++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_connector.c | 8 ++++++++ drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_hdmi.c | 13 +++++++++++++ 4 files changed, 46 insertions(+)
drivers/gpu/drm/i915/intel_atomic.c +24 -0
@@ -102,6 +102,20 @@ int intel_digital_connector_atomic_set_property(struct drm_connector *connector,return -EINVAL ; } +static inline bool check_colorspace_is_rgb (u32 colorspace) +{ +if (colorspace | (DRM_MODE_COLORIMETRY_OPRGB | +DRM_MODE_COLORIMETRY_BT2020_RGB | +DRM_MODE_COLORIMETRY_DCI_P3_RGB_D65 | +DRM_MODE_COLORIMETRY_DCI_P3_RGB_THEATER | +DRM_MODE_DP_COLORIMETRY_SRGB | +DRM_MODE_DP_COLORIMETRY_RGB_WIDE_GAMUT | +DRM_MODE_DP_COLORIMETRY_SCRGB )) +return true; + +return false; +} +int intel_digital_connector_atomic_check (struct drm_connector *conn,struct drm_connector_state *new_state) {
@@ -118,6 +132,15 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn,if (!new_state->crtc)return 0 ; +/* +* Reject any planar formats, as currently not enabled. +* ToDo: Add a output CSC property interface to control planar +* formats. +*/ +if ((new_conn_state->base.colorspace !=DRM_MODE_COLORIMETRY_DEFAULT ) || + !check_colorspace_is_rgb (new_conn_state->base.colorspace)) +return 0 ; + crtc_state =drm_atomic_get_new_crtc_state (new_state->state, new_state->crtc);/*
@@ -126,6 +149,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
@@ -1803,6 +1803,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 +13 -0
@@ -498,6 +498,8 @@ static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder,else frame.avi.colorspace =HDMI_COLORSPACE_RGB ; +drm_hdmi_avi_infoframe_colorspace (&frame.avi, conn_state); + drm_hdmi_avi_infoframe_quant_range(&frame.avi, conn_state->connector, adjusted_mode,
@@ -2143,10 +2145,21 @@ 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 +* ToDo: This needs to be extended for LSPCON implementation +* as well. Will be implemented separately. +*/ +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: [v15 4/4] drm/i915: Attach colorspace property and enable modeset
Quoted 61 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.
v8: Moved colorspace AVI Infoframe programming to drm core and removed from driver as per Ville's suggestion.
v9: Added a check to allow only RGB colorspaces to be set in infoframe through the colorspace property. Since there is no output csc property to control planar formats and it will be added later. Changes for
RGB->YUVconversion inside driver without userspace knowledge is still supported. This is as per Ville's suggestion.v10: Fixed an error in if check for rgb colorspace.
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 | 24 ++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_connector.c | 8 ++++++++ drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_hdmi.c | 13 +++++++++++++ 4 files changed, 46 insertions(+)drivers/gpu/drm/i915/intel_atomic.c +0
-0@@ -102,6 +102,20 @@ int intel_digital_connector_atomic_set_property(struct drm_connector *connector,return -EINVAL ; }
drivers/gpu/drm/i915/intel_atomic.c int intel_digital_connector_atomic_set_property(struct drm_connector *connector, · line 114
Quoted 10 lines
drivers/gpu/drm/i915/intel_atomic.c +10
-0+static inline bool check_colorspace_is_rgb (u32 colorspace) +{ +if (colorspace | (DRM_MODE_COLORIMETRY_OPRGB | +DRM_MODE_COLORIMETRY_BT2020_RGB | +DRM_MODE_COLORIMETRY_DCI_P3_RGB_D65 | +DRM_MODE_COLORIMETRY_DCI_P3_RGB_THEATER | +DRM_MODE_DP_COLORIMETRY_SRGB | +DRM_MODE_DP_COLORIMETRY_RGB_WIDE_GAMUT | +DRM_MODE_DP_COLORIMETRY_SCRGB )) +return true;
That's the same as
bool func(...)
{
return true;
}Quoted 9 lines
drivers/gpu/drm/i915/intel_atomic.c +4
-0+ +return false; +} +int intel_digital_connector_atomic_check (struct drm_connector *conn,struct drm_connector_state *new_state) {@@ -118,6 +132,15 @@ int intel_digital_connector_atomic_check(struct drm_connector *conn,if (!new_state->crtc)
drivers/gpu/drm/i915/intel_atomic.c int intel_digital_connector_atomic_check(struct drm_connector *conn, · line 142
Quoted 10 lines
drivers/gpu/drm/i915/intel_atomic.c +8
-0return 0 ; +/* +* Reject any planar formats, as currently not enabled. +* ToDo: Add a output CSC property interface to control planar +* formats. +*/ +if ((new_conn_state->base.colorspace !=DRM_MODE_COLORIMETRY_DEFAULT ) || + !check_colorspace_is_rgb (new_conn_state->base.colorspace)) +return 0 ;
Not sure what this stuff has to do with planar vs. not.
Either way, the code doesn't make sense.
Quoted 82 lines
drivers/gpu/drm/i915/intel_atomic.c +2
-0+ crtc_state =drm_atomic_get_new_crtc_state (new_state->state, new_state->crtc);/* @@ -126,6 +149,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@@ -1803,6 +1803,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 +13
-0@@ -498,6 +498,8 @@ static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder,else frame.avi.colorspace =HDMI_COLORSPACE_RGB ; +drm_hdmi_avi_infoframe_colorspace (&frame.avi, conn_state); + drm_hdmi_avi_infoframe_quant_range(&frame.avi, conn_state->connector, adjusted_mode,@@ -2143,10 +2145,21 @@ 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 +* ToDo: This needs to be extended for LSPCON implementation +* as well. Will be implemented separately. +*/ +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: [Intel-gfx] [v15 4/4] drm/i915: Attach colorspace property and enable modeset
Quoted 87 lines
-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Tuesday, February 12, 2019 10:32 PM
To: Shankar, Uma <[email protected]>
Cc: [email protected]; [email protected]; Syrjala, Ville <[email protected]>; Lankhorst, Maarten <[email protected]>
Subject: Re: [Intel-gfx] [v15 4/4] drm/i915: Attach colorspace property and enable modesetdrivers/gpu/drm/i915/intel_atomic.c int intel_digital_connector_atomic_set_property(struct
Quoted 59 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.
v8: Moved colorspace AVI Infoframe programming to drm core and removed from driver as per Ville's suggestion.
v9: Added a check to allow only RGB colorspaces to be set in infoframe through the colorspace property. Since there is no output csc property to control planar formats and it will be added later. Changes for
RGB->YUVconversion inside driver without userspace knowledge is still supported. This is as per Ville's suggestion.v10: Fixed an error in if check for rgb colorspace.
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 | 24 ++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_connector.c | 8 ++++++++ drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_hdmi.c | 13 +++++++++++++ 4 files changed, 46 insertions(+)drivers/gpu/drm/i915/intel_atomic.c +0
-0@@ -102,6 +102,20 @@ int intel_digital_connector_atomic_set_property(struct
drm_connector*connector,drivers/gpu/drm/i915/intel_atomic.c int intel_digital_connector_atomic_set_property(struct drm_connector *connector, · line 114
Quoted 12 lines
drivers/gpu/drm/i915/intel_atomic.c +9
-0return -EINVAL ; } +static inline bool check_colorspace_is_rgb (u32 colorspace) { +if (colorspace | (DRM_MODE_COLORIMETRY_OPRGB | +DRM_MODE_COLORIMETRY_BT2020_RGB | +DRM_MODE_COLORIMETRY_DCI_P3_RGB_D65 | +DRM_MODE_COLORIMETRY_DCI_P3_RGB_THEATER | +DRM_MODE_DP_COLORIMETRY_SRGB | +DRM_MODE_DP_COLORIMETRY_RGB_WIDE_GAMUT | +DRM_MODE_DP_COLORIMETRY_SCRGB )) +return true;That's the same as
Quoted 1 line
bool func(...)
>{Quoted 2 lines
return true; }
Oops, my bad should not work very late on Fridays :(. I feel we don't need this at all.
Quoted 18 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_atomic.c +4
-0+ +return false; +} +int intel_digital_connector_atomic_check (struct drm_connector *conn,struct drm_connector_state *new_state) {(quoted diff) +0
-0@@ -118,6 +132,15 @@ > int intel_digital_connector_atomic_check(struct drm_connector *conn, > if (!new_state->crtc) > return 0;drivers/gpu/drm/i915/intel_atomic.c int intel_digital_connector_atomic_check(struct drm_connector *conn,
Quoted 7 lines
drivers/gpu/drm/i915/intel_atomic.c +6
-0+/* +* Reject any planar formats, as currently not enabled. +* ToDo: Add a output CSC property interface to control planar +* formats. +*/ + if ((new_conn_state->base.colorspace !=
DRM_MODE_COLORIMETRY_DEFAULT) ||
Quoted 6 lines
drivers/gpu/drm/i915/intel_atomic.c int intel_digital_connector_atomic_check(struct drm_connector *conn, · line 142
Quoted 2 lines
drivers/gpu/drm/i915/intel_atomic.c +2
-0+ !check_colorspace_is_rgb(new_conn_state->base.colorspace)) +return 0 ;Not sure what this stuff has to do with planar vs. not.
Either way, the code doesn't make sense.
Hmm, intention here was to allow only RGB variants of colorspace to be set through this property till we have output csc control for YCbCr, but I believe we can let user choose that. Also I agree this is not correctly handled here as well. So, I will drop this change altogether.
Quoted 91 lines
drivers/gpu/drm/i915/intel_atomic.c int intel_digital_connector_atomic_check(struct
Quoted 6 lines
drivers/gpu/drm/i915/intel_atomic.c +1
-0+ crtc_state = drm_atomic_get_new_crtc_state(new_state->state,
new_state->crtc);drivers/gpu/drm/i915/intel_atomic.c +0
-0/* @@ -126,6 +149,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@@ -1803,6 +1803,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 f125a62..765718b 100644drivers/gpu/drm/i915/intel_hdmi.c +0
-0@@ -498,6 +498,8 @@ static void intel_hdmi_set_avi_infoframe(struct
intel_encoder*encoder,Quoted 33 lines
drivers/gpu/drm/i915/intel_hdmi.c +2
-0else frame.avi.colorspace =HDMI_COLORSPACE_RGB ; +drm_hdmi_avi_infoframe_colorspace (&frame.avi, conn_state); + drm_hdmi_avi_infoframe_quant_range(&frame.avi, conn_state->connector, adjusted_mode,@@ -2143,10 +2145,21 @@ 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 +11
-1struct 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 +* ToDo: This needs to be extended for LSPCON implementation +* as well. Will be implemented separately. +*/ +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 ; --1.9.1
Quoted 8 lines
Quoted 4 lines
_______________________________________________
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
Patchwork
CI✓ Fi.CI.BAT: success for Add Colorspace connector property interface (rev14)
In reply to Uma Shankar== Series Details ==
== Series Details ==
Series: Add Colorspace connector property interface (rev14)
URL : https://patchwork.freedesktop.org/series/47132/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5568 -> Patchwork_12180
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/47132/revisions/14/mbox/
Known issues
------------
Here are the changes found in Patchwork_12180 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_module_load@reload-with-fault-injection:
- fi-kbl-7567u: PASS -> DMESG-WARN [fdo#103558] / [fdo#105602] / [fdo#108529] +2
* igt@i915_selftest@live_evict:
- fi-bsw-kefka: PASS -> DMESG-WARN [fdo#107709]
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: PASS -> FAIL [fdo#109485]
* igt@pm_rpm@basic-rte:
- fi-bsw-kefka: PASS -> FAIL [fdo#108800]
#### Possible fixes ####
* igt@kms_busy@basic-flip-b:
- fi-gdg-551: FAIL [fdo#103182] -> PASS
* igt@kms_frontbuffer_tracking@basic:
- {fi-icl-u2}: FAIL [fdo#103167] -> PASS
* igt@pm_rpm@module-reload:
- fi-skl-6770hq: FAIL [fdo#108511] -> PASS
- {fi-whl-u}: DMESG-WARN [fdo#109513] -> PASS
* igt@prime_vgem@basic-fence-flip:
- fi-gdg-551: DMESG-FAIL [fdo#103182] -> PASS
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103182]: https://bugs.freedesktop.org/show_bug.cgi?id=103182
[fdo#103558]: https://bugs.freedesktop.org/show_bug.cgi?id=103558
[fdo#105602]: https://bugs.freedesktop.org/show_bug.cgi?id=105602
[fdo#107709]: https://bugs.freedesktop.org/show_bug.cgi?id=107709
[fdo#108511]: https://bugs.freedesktop.org/show_bug.cgi?id=108511
[fdo#108529]: https://bugs.freedesktop.org/show_bug.cgi?id=108529
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#108800]: https://bugs.freedesktop.org/show_bug.cgi?id=108800
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#109485]: https://bugs.freedesktop.org/show_bug.cgi?id=109485
[fdo#109513]: https://bugs.freedesktop.org/show_bug.cgi?id=109513
Participating hosts (48 -> 44)
------------------------------
Additional (2): fi-icl-u3 fi-pnv-d510
Missing (6): fi-kbl-soraka fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-icl-y fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_5568 -> Patchwork_12180
CI_DRM_5568: d4794b009ccd1ef8816e15c833f07ab696911a8d @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4815: 947301563259726b65ce47d3a3fe37931ed42efe @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12180: 0dfba1c23ddb91de2a74b8401986442a18280273 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
0dfba1c23ddb drm/i915: Attach colorspace property and enable modeset 6e30717d3a6c drm: Add colorspace info to AVI Infoframe 8efb8eb9d670 drm: Add DP colorspace property15e6383fc8d1 drm: Add HDMI colorspace property
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12180/
_______________________________________________
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 (rev14)
In reply to Uma Shankar== Series Details ==
== Series Details ==
Series: Add Colorspace connector property interface (rev14)
URL : https://patchwork.freedesktop.org/series/47132/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5568_full -> Patchwork_12180_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_12180_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_suspend@shrink:
- shard-glk: NOTRUN -> DMESG-WARN [fdo#109244]
* igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-c:
- shard-kbl: NOTRUN -> DMESG-WARN [fdo#107956]
* igt@kms_cursor_crc@cursor-128x128-random:
- shard-apl: PASS -> FAIL [fdo#103232] +4
* igt@kms_cursor_crc@cursor-128x42-onscreen:
- shard-kbl: NOTRUN -> FAIL [fdo#103232]
* igt@kms_cursor_crc@cursor-256x256-random:
- shard-glk: NOTRUN -> FAIL [fdo#103232]
* igt@kms_cursor_crc@cursor-alpha-opaque:
- shard-apl: PASS -> FAIL [fdo#109350]
* igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic:
- shard-hsw: PASS -> FAIL [fdo#105767]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-wc:
- shard-glk: NOTRUN -> FAIL [fdo#103167]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-onoff:
- shard-apl: PASS -> FAIL [fdo#103167] +2
* igt@kms_plane@plane-position-covered-pipe-a-planes:
- shard-glk: PASS -> FAIL [fdo#103166]
* igt@kms_plane@plane-position-covered-pipe-c-planes:
- shard-apl: PASS -> FAIL [fdo#103166] +3
* igt@kms_plane_alpha_blend@pipe-a-alpha-7efc:
- shard-apl: NOTRUN -> FAIL [fdo#108145]
* igt@kms_plane_alpha_blend@pipe-b-alpha-basic:
- shard-kbl: NOTRUN -> FAIL [fdo#108145] / [fdo#108590]
* igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb:
- shard-kbl: NOTRUN -> FAIL [fdo#108145]
* igt@kms_universal_plane@universal-plane-pipe-b-functional:
- shard-kbl: NOTRUN -> FAIL [fdo#103166]
#### Possible fixes ####
* igt@gem_eio@reset-stress:
- shard-hsw: INCOMPLETE [fdo#103540] / [fdo#109482] -> PASS
* igt@kms_cursor_crc@cursor-256x256-dpms:
- shard-apl: FAIL [fdo#103232] -> PASS
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-wc:
- shard-apl: FAIL [fdo#103167] -> PASS
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-onoff:
- shard-glk: FAIL [fdo#103167] -> PASS +4
* igt@kms_plane_multiple@atomic-pipe-a-tiling-none:
- shard-apl: FAIL [fdo#103166] -> PASS
* igt@kms_plane_multiple@atomic-pipe-c-tiling-x:
- shard-glk: FAIL [fdo#103166] -> PASS +1
* igt@tools_test@tools_test:
- shard-snb: {SKIP} [fdo#109271] -> PASS +1
#### Warnings ####
* igt@i915_suspend@shrink:
- shard-snb: DMESG-WARN [fdo#109244] -> INCOMPLETE [fdo#105411] / [fdo#106886]
* igt@kms_frontbuffer_tracking@fbc-farfromfence:
- shard-snb: DMESG-FAIL [fdo#107469] -> INCOMPLETE [fdo#105411]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
[fdo#105767]: https://bugs.freedesktop.org/show_bug.cgi?id=105767
[fdo#106886]: https://bugs.freedesktop.org/show_bug.cgi?id=106886
[fdo#107469]: https://bugs.freedesktop.org/show_bug.cgi?id=107469
[fdo#107956]: https://bugs.freedesktop.org/show_bug.cgi?id=107956
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108590]: https://bugs.freedesktop.org/show_bug.cgi?id=108590
[fdo#109244]: https://bugs.freedesktop.org/show_bug.cgi?id=109244
[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#109482]: https://bugs.freedesktop.org/show_bug.cgi?id=109482
Participating hosts (7 -> 5)
------------------------------
Missing (2): shard-skl shard-iclb
Build changes
-------------
* Linux: CI_DRM_5568 -> Patchwork_12180
CI_DRM_5568: d4794b009ccd1ef8816e15c833f07ab696911a8d @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4815: 947301563259726b65ce47d3a3fe37931ed42efe @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12180: 0dfba1c23ddb91de2a74b8401986442a18280273 @ 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_12180/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx