Enabling content-type setting for HDMI displays.
Subsystems (4)
v4 cover Enabling content-type setting for HDMI displays.
From: Stanislav Lisovskiy <[email protected]>
Rev 1:
Added content type setting property to drm_connector(part 1) and enabled transmitting it with HDMI AVI infoframes for i915(part 2).
Rev 2:
Moved helper function which attaches content type property to the drm core, as was suggested.
Removed redundant connector state initialization.
Rev 3:
Removed caps in drm_content_type_enum_list.
After some discussion it turned out that HDMI Spec 1.4 was wrongly assuming that IT Content(itc) bit doesn't affect Content type states, however itc bit needs to be manupulated as well. In order to not expose additional property for itc, for sake of simplicity it was decided to bind those together in same "content type" property.
Rev 4:
Added it_content checking in intel_digital_connector_atomic_check. Fixed documentation for new content type enum.
Stanislav Lisovskiy (2):
drm: content-type property for HDMI connector
i915: content-type property for HDMI connector
Documentation/gpu/kms-properties.csv | 1 + drivers/gpu/drm/drm_atomic.c | 17 ++++++++++ drivers/gpu/drm/drm_connector.c | 51 ++++++++++++++++++++++++++++ drivers/gpu/drm/drm_edid.c | 2 ++ drivers/gpu/drm/i915/intel_atomic.c | 2 ++ drivers/gpu/drm/i915/intel_hdmi.c | 4 +++ include/drm/drm_connector.h | 18 ++++++++++ include/drm/drm_mode_config.h | 5 +++ include/uapi/drm/drm_mode.h | 7 ++++ 9 files changed, 107 insertions(+)
Signature · 6 lines
2.17.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 1/2 drm: content-type property for HDMI connector
From: Stanislav Lisovskiy <[email protected]>
Added content_type property todrm_connector_state in order to properly handle
external HDMI TV content-type setting.
--- Documentation/gpu/kms-properties.csv | 1 + drivers/gpu/drm/drm_atomic.c | 17 ++++++++++ drivers/gpu/drm/drm_connector.c | 51 ++++++++++++++++++++++++++++ drivers/gpu/drm/drm_edid.c | 2 ++ include/drm/drm_connector.h | 18 ++++++++++ include/drm/drm_mode_config.h | 5 +++ include/uapi/drm/drm_mode.h | 7 ++++ 7 files changed, 101 insertions(+)
Documentation/gpu/kms-properties.csv +1 -0
@@ -17,6 +17,7 @@ Owner Module/Drivers,Group,Property Name,Type,Property Values,Object attached,De ,Virtual GPU,“suggested X”,RANGE,"Min=0, Max=0xffffffff",Connector,property to suggest an X offset for a connector ,,“suggested Y”,RANGE,"Min=0, Max=0xffffffff",Connector,property to suggest an Y offset for a connector ,Optional,"""aspect ratio""",ENUM,"{ ""None"", ""4:3"", ""16:9"" }",Connector,TDB +,Optional,"""content type""",ENUM,"{ ""No data"", ""Graphics"", ""Photo"", ""Cinema"", ""Game"" }",Connector,TBD i915,Generic,"""Broadcast RGB""",ENUM,"{ ""Automatic"", ""Full"", ""Limited 16:235"" }",Connector,"When this property is set to Limited 16:235 and CTM is set, the hardware will be programmed with the result of the multiplication of CTM by the limited range matrix to ensure the pixels normaly in the range 0..1.0 are remapped to the range 16/255..235/255." ,,“audio”,ENUM,"{ ""force-dvi"", ""off"", ""auto"", ""on"" }",Connector,TBD ,SDVO-TV,“mode”,ENUM,"{ ""NTSC_M"", ""NTSC_J"", ""NTSC_443"", ""PAL_B"" } etc.",Connector,TBD
drivers/gpu/drm/drm_atomic.c +17 -0
@@ -1266,6 +1266,15 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector, state->link_status = val; }else if (property == config->aspect_ratio_property) { state->picture_aspect_ratio = val; + }else if (property == config->content_type_property) { +/* +* Lowest two bits of content_type property control +* content_type, bit 2 controls itc bit. +* It was decided to have a single property called +* content_type, instead of content_type and itc. +*/ + state->content_type = val &3 ; + state->it_content = val >>2 ; }else if (property == connector->scaling_mode_property) { state->scaling_mode = val; }else if (property == connector->content_protection_property) {
@@ -1351,6 +1360,14 @@ drm_atomic_connector_get_property(struct drm_connector *connector, *val = state->link_status; }else if (property == config->aspect_ratio_property) { *val = state->picture_aspect_ratio; + }else if (property == config->content_type_property) { +/* +* Lowest two bits of content_type property control +* content_type, bit 2 controls itc bit. +* It was decided to have a single property called +* content_type, instead of content_type and itc. +*/ + *val = state->content_type | (state->it_content <<2 ); }else if (property == connector->scaling_mode_property) { *val = state->scaling_mode; }else if (property == connector->content_protection_property) {
drivers/gpu/drm/drm_connector.c +51 -0
69 lines not on this page · raw message
drivers/gpu/drm/drm_edid.c +2 -0
@@ -4867,6 +4867,8 @@ drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame, } frame->picture_aspect =HDMI_PICTURE_ASPECT_NONE ; + frame->content_type =HDMI_CONTENT_TYPE_GRAPHICS ; + frame->itc =0 ;/* * Populate picture aspect ratio from either
include/drm/drm_connector.h +18 -0
@@ -418,6 +418,22 @@ struct drm_connector_state {*/ enum hdmi_picture_aspect picture_aspect_ratio; +/** +* @content_type: Connector property to control the +* HDMI infoframe content type setting. +* The %DRM_MODE_CONTENT_TYPE_\* values lowest 2 bits much +* match the values for &enum hdmi_content_type +*/ +enum hdmi_content_type content_type; + +/** +* @it_content: Connector property to control the +* HDMI infoframe it content setting(used with content type). +* The %DRM_MODE_CONTENT_TYPE_\* values bit 2 +* match the values of it_content +*/ +bool it_content; +/** * @scaling_mode: Connector property to control the * upscaling, mostly used for built-in panels.
@@ -1089,11 +1105,13 @@ int drm_mode_create_tv_properties(struct drm_device *dev,unsigned int num_modes, const char * const modes[]);int drm_mode_create_scaling_mode_property (struct drm_device *dev); +int drm_connector_attach_content_type_property (struct drm_connector *dev);int drm_connector_attach_scaling_mode_property (struct drm_connector *connector,u32 scaling_mode_mask);int drm_connector_attach_content_protection_property (struct drm_connector *connector);int drm_mode_create_aspect_ratio_property (struct drm_device *dev); +int drm_mode_create_content_type_property (struct drm_device *dev);int drm_mode_create_suggested_offset_properties (struct drm_device *dev); int drm_mode_connector_set_path_property(struct drm_connector *connector,
include/drm/drm_mode_config.h +5 -0
@@ -726,6 +726,11 @@ struct drm_mode_config {* HDMI infoframe aspect ratio setting. */ struct drm_property *aspect_ratio_property; +/** +* @content_type_property: Optional connector property to control the +* HDMI infoframe content type setting. +*/ +struct drm_property *content_type_property;/** * @degamma_lut_property: Optional CRTC property to set the LUT used to * convert the framebuffer's colors to linear gamma.
include/uapi/drm/drm_mode.h +7 -0
@@ -94,6 +94,13 @@ extern "C" {#define DRM_MODE_PICTURE_ASPECT_4_3 1#define DRM_MODE_PICTURE_ASPECT_16_9 2 +/* HDMI content type and itc bit bound together for simplicity */ +#define DRM_MODE_CONTENT_TYPE_NO_DATA 0 +#define DRM_MODE_CONTENT_TYPE_GRAPHICS 4 +#define DRM_MODE_CONTENT_TYPE_PHOTO 5 +#define DRM_MODE_CONTENT_TYPE_CINEMA 6 +#define DRM_MODE_CONTENT_TYPE_GAME 7 +/* Aspect ratio flag bitmask (4 bits 22:19) */ #define DRM_MODE_FLAG_PIC_AR_MASK (0x0F<<19)#define DRM_MODE_FLAG_PIC_AR_NONE \
Signature · 6 lines
2.17.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 2/2 i915: content-type property for HDMI connector
In reply to StanLisFrom: Stanislav Lisovskiy <[email protected]>
Added encoding of drm content_type property from drm_connector_state within AVI infoframe in order to properly handle external HDMI TV content-type setting.
This requires also manipulationg ITC bit, as stated in HDMI spec.
--- drivers/gpu/drm/i915/intel_atomic.c | 2 ++ drivers/gpu/drm/i915/intel_hdmi.c | 4 ++++ 2 files changed, 6 insertions(+)
drivers/gpu/drm/i915/intel_atomic.c +2 -0
@@ -124,6 +124,8 @@ 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.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.it_content != old_conn_state->base.it_content || new_conn_state->base.scaling_mode != old_conn_state->base.scaling_mode) crtc_state->mode_changed = true;
drivers/gpu/drm/i915/intel_hdmi.c +4 -0
@@ -491,6 +491,9 @@ static void intel_hdmi_set_avi_infoframe(struct drm_encoder *encoder, intel_hdmi->rgb_quant_range_selectable, is_hdmi2_sink); + frame.avi.content_type = connector->state->content_type; + frame.avi.itc = connector->state->it_content; +/* TODO: handle pixel repetition for YCBCR420 outputs */ intel_write_infoframe (encoder, crtc_state, &frame); }
@@ -2065,6 +2068,7 @@ intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *cintel_attach_force_audio_property (connector);intel_attach_broadcast_rgb_property (connector);intel_attach_aspect_ratio_property (connector); +drm_connector_attach_content_type_property (connector); connector->state->picture_aspect_ratio =HDMI_PICTURE_ASPECT_NONE ; }
Signature · 6 lines
2.17.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for Enabling content-type setting for HDMI displays. (rev3)
In reply to StanLis== Series Details ==
== Series Details ==
Series: Enabling content-type setting for HDMI displays. (rev3)
URL : https://patchwork.freedesktop.org/series/41876/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 859e0b2e808c drm: content-type property for HDMI connector -:92: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #92: FILE: drivers/gpu/drm/drm_connector.c:1017: + drm_object_attach_property(&connector->base, + connector->dev->mode_config.content_type_property,
-:122: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #122: FILE: drivers/gpu/drm/drm_connector.c:1304:
+ drm_property_create_enum(dev, 0, "content type",
+ drm_content_type_enum_list,
-:125: CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "!dev->mode_config.content_type_property" #125: FILE: drivers/gpu/drm/drm_connector.c:1307:
+ if (dev->mode_config.content_type_property == NULL)
total: 0 errors, 0 warnings, 3 checks, 172 lines checked 67311c808659 i915: content-type property for HDMI connector
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Enabling content-type setting for HDMI displays. (rev3)
In reply to StanLis== Series Details ==
== Series Details ==
Series: Enabling content-type setting for HDMI displays. (rev3)
URL : https://patchwork.freedesktop.org/series/41876/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4068 -> Patchwork_8749 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/41876/revisions/3/mbox/
== Known issues ==
Here are the changes found in Patchwork_8749 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@debugfs_test@read_all_entries:
fi-snb-2520m: PASS -> INCOMPLETE (fdo#103713)
igt@gem_exec_suspend@basic-s3:
fi-ivb-3520m: PASS -> DMESG-WARN (fdo#106084)
igt@gem_exec_suspend@basic-s4-devices:
fi-kbl-7500u: PASS -> DMESG-WARN (fdo#105128)
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
fi-bxt-dsi: PASS -> INCOMPLETE (fdo#103927)
==== Possible fixes ====
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
fi-ivb-3520m: DMESG-WARN (fdo#106084) -> PASS fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#105128 https://bugs.freedesktop.org/show_bug.cgi?id=105128
fdo#106084 https://bugs.freedesktop.org/show_bug.cgi?id=106084
== Participating hosts (34 -> 32) ==
Additional (1): fi-glk-1
Missing (3): fi-ctg-p8600 fi-ilk-m540 fi-skl-6700hq
== Build changes ==
* Linux: CI_DRM_4068 -> Patchwork_8749
CI_DRM_4068: 28fecc12e5c2b1beb9ab89e3616266d5d5e58e3d @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4441: 83ba5b7d3bde48b383df41792fc9c955a5a23bdb @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_8749: 67311c808659d0d83a5ca6b844f72fdd9d4b47d4 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4441: e60d247eb359f044caf0c09904da14e39d7adca1 @ git://anongit.freedesktop.org/piglit
== Linux commits ==
67311c808659 i915: content-type property for HDMI connector 859e0b2e808c drm: content-type property for HDMI connector
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8749/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for Enabling content-type setting for HDMI displays. (rev3)
In reply to StanLis== Series Details ==
== Series Details ==
Series: Enabling content-type setting for HDMI displays. (rev3)
URL : https://patchwork.freedesktop.org/series/41876/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4068_full -> Patchwork_8749_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_8749_full need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_8749_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/41876/revisions/3/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_8749_full:
=== IGT changes ===
==== Warnings ====
igt@gem_mocs_settings@mocs-rc6-dirty-render:
shard-kbl: SKIP -> PASS +2
igt@gem_mocs_settings@mocs-rc6-vebox:
shard-kbl: PASS -> SKIP
igt@kms_mmap_write_crc:
shard-glk: SKIP -> PASS +73
igt@kms_universal_plane@universal-plane-pipe-b-sanity:
shard-glk: PASS -> SKIP +70== Known issues ==
Here are the changes found in Patchwork_8749_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_atomic_transition@1x-modeset-transitions-fencing:
shard-apl: PASS -> FAIL (fdo#103207)
igt@kms_cursor_legacy@2x-long-flip-vs-cursor-atomic:
shard-hsw: PASS -> FAIL (fdo#104873)
==== Possible fixes ====
igt@gem_ppgtt@blt-vs-render-ctx0:
shard-kbl: INCOMPLETE (fdo#106023, fdo#103665) -> PASS
igt@kms_flip@2x-wf_vblank-ts-check:
shard-hsw: FAIL (fdo#100368) -> PASS +1
igt@kms_flip@absolute-wf_vblank-interruptible:
shard-glk: FAIL (fdo#106087) -> PASS
igt@kms_flip@plain-flip-ts-check-interruptible:
shard-glk: FAIL (fdo#100368) -> SKIP fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103207 https://bugs.freedesktop.org/show_bug.cgi?id=103207
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#104873 https://bugs.freedesktop.org/show_bug.cgi?id=104873
fdo#106023 https://bugs.freedesktop.org/show_bug.cgi?id=106023
fdo#106087 https://bugs.freedesktop.org/show_bug.cgi?id=106087
== Participating hosts (6 -> 5) ==
Missing (1): shard-glkb
== Build changes ==
* Linux: CI_DRM_4068 -> Patchwork_8749
CI_DRM_4068: 28fecc12e5c2b1beb9ab89e3616266d5d5e58e3d @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4441: 83ba5b7d3bde48b383df41792fc9c955a5a23bdb @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_8749: 67311c808659d0d83a5ca6b844f72fdd9d4b47d4 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4441: e60d247eb359f044caf0c09904da14e39d7adca1 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8749/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx