drm/i915: Add HDCP capability info to i915_display_info.
Subsystems (2)
PATCH 1/1 drm/i915: Add HDCP capability info to i915_display_info.
To identify the HDCP capability of the display connected to CI systems, we need to add the hdcp capability probing in i915_display_info.
This will also help to populate the HDCP capability of the CI systems to CI H/W logs maintained at https://intel-gfx-ci.01.org/hardware/.
It will facilitate to determine the kms_content_protection behavior on a particular CI system.
--- drivers/gpu/drm/i915/i915_debugfs.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +26 -0
@@ -2569,6 +2569,30 @@ static void intel_panel_info(struct seq_file *m, struct intel_panel *panel)intel_seq_print_mode (m,2 , mode); } +static void intel_hdcp_info (struct seq_file *m, +struct intel_connector *intel_connector) +{ +bool hdcp_cap, hdcp2_cap; + +/* HDCP is supported by connector */ +if (!intel_connector->hdcp.shim) +return ; + +seq_printf (m,"\tHDCP version: " ); + hdcp_cap =intel_hdcp_capable (intel_connector); + hdcp2_cap =intel_hdcp2_capable (intel_connector); + +if (hdcp_cap) +seq_puts (m,"HDCP1.4 " ); +if (hdcp2_cap) +seq_puts (m,"HDCP2.2 " ); + +if (!hdcp_cap && !hdcp2_cap) +seq_puts (m,"None" ); + +seq_puts (m,"\n" ); +} +static void intel_dp_info (struct seq_file *m,struct intel_connector *intel_connector) {
@@ -2577,6 +2601,7 @@ static void intel_dp_info(struct seq_file *m,seq_printf (m,"\tDPCD rev: %x\n" , intel_dp->dpcd[DP_DPCD_REV ]);seq_printf (m,"\taudio support: %s\n" ,yesno (intel_dp->has_audio)); +intel_hdcp_info (m, intel_connector);if (intel_connector->base.connector_type == DRM_MODE_CONNECTOR_eDP)intel_panel_info (m, &intel_connector->panel);
@@ -2605,6 +2630,7 @@ static void intel_hdmi_info(struct seq_file *m,struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (&intel_encoder->base);seq_printf (m,"\taudio support: %s\n" ,yesno (intel_hdmi->has_audio)); +intel_hdcp_info (m, intel_connector); } static void intel_lvds_info(struct seq_file *m,
Signature · 6 lines
2.21.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for drm/i915: Add HDCP capability info to i915_display_info.
== Series Details ==
== Series Details ==
Series: drm/i915: Add HDCP capability info to i915_display_info.
URL : https://patchwork.freedesktop.org/series/63819/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 84154a9a0135 drm/i915: Add HDCP capability info to i915_display_info. -:35: WARNING:PREFER_SEQ_PUTS: Prefer seq_puts to seq_printf #35: FILE: drivers/gpu/drm/i915/i915_debugfs.c:2581: + seq_printf(m, "\tHDCP version: ");
total: 0 errors, 1 warnings, 0 checks, 44 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: Add HDCP capability info to i915_display_info.
In reply to Anshuman Gupta== Series Details ==
== Series Details ==
Series: drm/i915: Add HDCP capability info to i915_display_info.
URL : https://patchwork.freedesktop.org/series/63819/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6498 -> Patchwork_13675
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13675/
Known issues
------------
Here are the changes found in Patchwork_13675 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live_contexts:
- fi-skl-iommu: [PASS][1] -> [INCOMPLETE][2] ([fdo#111050])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6498/fi-skl-iommu/igt@i915_selftest@live_contexts.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13675/fi-skl-iommu/igt@i915_selftest@live_contexts.html
#### Possible fixes ####
* igt@gem_ctx_create@basic-files:
- fi-icl-u3: [INCOMPLETE][3] ([fdo#107713] / [fdo#109100]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6498/fi-icl-u3/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13675/fi-icl-u3/igt@[email protected]
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
[fdo#111050]: https://bugs.freedesktop.org/show_bug.cgi?id=111050
Participating hosts (55 -> 46)
------------------------------
Missing (9): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-bsw-n3050 fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_6498 -> Patchwork_13675
CI_DRM_6498: d8b53b0eabbd01f4efc091e9cadc5cde41a6362a @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5100: 0ea68a1efbfcc4961f2f816ab59e4ad8136c6250 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13675: 84154a9a0135eeb31877f89512f8bab7368f7748 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
84154a9a0135 drm/i915: Add HDCP capability info to i915_display_info.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13675/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915: Add HDCP capability info to i915_display_info.
In reply to Anshuman Gupta== Series Details ==
== Series Details ==
Series: drm/i915: Add HDCP capability info to i915_display_info.
URL : https://patchwork.freedesktop.org/series/63819/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6498_full -> Patchwork_13675_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_13675_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_eio@unwedge-stress:
- shard-snb: [PASS][1] -> [FAIL][2] ([fdo#109661])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6498/shard-snb7/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13675/shard-snb7/igt@[email protected]
* igt@i915_pm_rc6_residency@rc6-accuracy:
- shard-snb: [PASS][3] -> [SKIP][4] ([fdo#109271])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6498/shard-snb4/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13675/shard-snb1/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-blt:
- shard-iclb: [PASS][5] -> [FAIL][6] ([fdo#103167]) +6 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6498/shard-iclb1/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13675/shard-iclb2/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-kbl: [PASS][7] -> [DMESG-WARN][8] ([fdo#108566]) +2 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6498/shard-kbl4/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13675/shard-kbl3/igt@[email protected]
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
- shard-apl: [PASS][9] -> [DMESG-WARN][10] ([fdo#108566]) +3 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6498/shard-apl4/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13675/shard-apl4/igt@[email protected]
* igt@kms_plane_lowres@pipe-a-tiling-y:
- shard-iclb: [PASS][11] -> [FAIL][12] ([fdo#103166])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6498/shard-iclb4/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13675/shard-iclb8/igt@[email protected]
* igt@kms_psr@psr2_cursor_blt:
- shard-iclb: [PASS][13] -> [SKIP][14] ([fdo#109441]) +3 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6498/shard-iclb2/igt@kms_psr@psr2_cursor_blt.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13675/shard-iclb3/igt@kms_psr@psr2_cursor_blt.html
* igt@kms_vblank@pipe-a-query-forked:
- shard-hsw: [PASS][15] -> [INCOMPLETE][16] ([fdo#103540])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6498/shard-hsw4/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13675/shard-hsw2/igt@[email protected]
* igt@perf@polling:
- shard-skl: [PASS][17] -> [FAIL][18] ([fdo#110728])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6498/shard-skl2/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13675/shard-skl10/igt@[email protected]
#### Possible fixes ####
* igt@gem_exec_schedule@smoketest-render:
- shard-iclb: [INCOMPLETE][19] ([fdo#107713]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6498/shard-iclb7/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13675/shard-iclb2/igt@[email protected]
* igt@i915_selftest@live_hangcheck:
- shard-iclb: [INCOMPLETE][21] ([fdo#107713] / [fdo#108569]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6498/shard-iclb4/igt@i915_selftest@live_hangcheck.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13675/shard-iclb5/igt@i915_selftest@live_hangcheck.html
* igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic:
- shard-hsw: [FAIL][23] ([fdo#105767]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6498/shard-hsw6/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13675/shard-hsw2/igt@[email protected]
* igt@kms_flip@flip-vs-suspend:
- shard-skl: [INCOMPLETE][25] ([fdo#109507]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6498/shard-skl10/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13675/shard-skl6/igt@[email protected]
* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-apl: [DMESG-WARN][27] ([fdo#108566]) -> [PASS][28] +3 similar issues
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6498/shard-apl1/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13675/shard-apl5/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-pwrite:
- shard-iclb: [FAIL][29] ([fdo#103167]) -> [PASS][30] +4 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6498/shard-iclb4/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-pwrite.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13675/shard-iclb8/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-pwrite.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite:
- shard-skl: [FAIL][31] ([fdo#103167]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6498/shard-skl8/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13675/shard-skl1/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite.html
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- shard-kbl: [DMESG-WARN][33] ([fdo#108566]) -> [PASS][34] +2 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6498/shard-kbl3/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13675/shard-kbl7/igt@[email protected]
* igt@kms_plane_lowres@pipe-a-tiling-x:
- shard-iclb: [FAIL][35] ([fdo#103166]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6498/shard-iclb1/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13675/shard-iclb2/igt@[email protected]
* igt@kms_psr@psr2_cursor_plane_move:
- shard-iclb: [SKIP][37] ([fdo#109441]) -> [PASS][38] +2 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6498/shard-iclb1/igt@kms_psr@psr2_cursor_plane_move.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13675/shard-iclb2/igt@kms_psr@psr2_cursor_plane_move.html
#### Warnings ####
* igt@kms_dp_dsc@basic-dsc-enable-edp:
- shard-iclb: [DMESG-WARN][39] ([fdo#107724]) -> [SKIP][40] ([fdo#109349])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6498/shard-iclb2/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13675/shard-iclb5/igt@[email protected]
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#105767]: https://bugs.freedesktop.org/show_bug.cgi?id=105767
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109507]: https://bugs.freedesktop.org/show_bug.cgi?id=109507
[fdo#109661]: https://bugs.freedesktop.org/show_bug.cgi?id=109661
[fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_6498 -> Patchwork_13675
CI_DRM_6498: d8b53b0eabbd01f4efc091e9cadc5cde41a6362a @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5100: 0ea68a1efbfcc4961f2f816ab59e4ad8136c6250 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13675: 84154a9a0135eeb31877f89512f8bab7368f7748 @ 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_13675/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 36 lines · Anshuman Gupta
To identify the HDCP capability of the display connected to CI systems, we need to add the hdcp capability probing in
i915_display_info.This will also help to populate the HDCP capability of the CI systems to CI H/W logs maintained at https://intel-gfx-ci.01.org/hardware/.
It will facilitate to determine thekms_content_protectionbehavior on a particular CI system.--- drivers/gpu/drm/i915/i915_debugfs.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)drivers/gpu/drm/i915/i915_debugfs.c +13
-0@@ -2569,6 +2569,30 @@ static void intel_panel_info(struct seq_file *m, struct intel_panel *panel)intel_seq_print_mode (m,2 , mode); } +static void intel_hdcp_info (struct seq_file *m, +struct intel_connector *intel_connector) +{ +bool hdcp_cap, hdcp2_cap; + +/* HDCP is supported by connector */ +if (!intel_connector->hdcp.shim) +return ; + +seq_printf (m,"\tHDCP version: " ); + hdcp_cap =intel_hdcp_capable (intel_connector); + hdcp2_cap =intel_hdcp2_capable (intel_connector); +
drivers/gpu/drm/i915/i915_debugfs.c static void intel_panel_info(struct seq_file *m, struct intel_panel *panel) · line 2594
Quoted 10 lines
drivers/gpu/drm/i915/i915_debugfs.c +10
-0+if (hdcp_cap) +seq_puts (m,"HDCP1.4 " ); +if (hdcp2_cap) +seq_puts (m,"HDCP2.2 " ); + +if (!hdcp_cap && !hdcp2_cap) +seq_puts (m,"None" ); + +seq_puts (m,"\n" ); +}
This is duplication of i915_hdcp_sink_capability_show. Hence reuse the same above function for i915_hdcp_sink_capability_show also.
drivers/gpu/drm/i915/i915_debugfs.c static void intel_dp_info(struct seq_file *m, · line 2604
Quoted 9 lines
drivers/gpu/drm/i915/i915_debugfs.c +2
-0+static void intel_dp_info (struct seq_file *m,struct intel_connector *intel_connector) {@@ -2577,6 +2601,7 @@ static void intel_dp_info(struct seq_file *m,seq_printf (m,"\tDPCD rev: %x\n" , intel_dp->dpcd[DP_DPCD_REV ]);seq_printf (m,"\taudio support: %s\n" ,yesno (intel_dp->has_audio)); +intel_hdcp_info (m, intel_connector);
We could add this hdcp_info call at the end of this function. As eDP and hdcp are mutually exclusive, both will result with same output.
-Ram
Quoted 14 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-0if (intel_connector->base.connector_type == DRM_MODE_CONNECTOR_eDP)intel_panel_info (m, &intel_connector->panel);@@ -2605,6 +2630,7 @@ static void intel_hdmi_info(struct seq_file *m,struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (&intel_encoder->base);seq_printf (m,"\taudio support: %s\n" ,yesno (intel_hdmi->has_audio)); +intel_hdcp_info (m, intel_connector); } static void intel_lvds_info(struct seq_file *m,Signature · 1 line
2.21.0
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx