drm/i915/dp_mst: Cast intel_connector->port as drm_dp_mst_port
PATCH v2 1/2 drm/i915/dp_mst: Cast intel_connector->port as drm_dp_mst_port
The only reason for having this cast as void * before was because we originally needed to use drm_dp_mst_get_port_validated() and friends in order to (attempt to) safely access MST ports. However, we've since improved how reference counting works with ports and mstbs such that we can now rely on drm_dp_mst_port structs remaining in memory for as long as the driver needs. This means we don't really need to cast this as void* anymore, and can just access the struct directly.
We'll also need this for the next commit, so that we can remove drm_dp_mst_port_has_audio().
--- drivers/gpu/drm/i915/display/intel_display_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_display_types.h +1 -1
@@ -438,7 +438,7 @@ struct intel_connector {state of connector->polled in case hotplug storm detection changes it */ u8 polled; -void *port;/* store this opaque as its illegal to dereference it */ +struct drm_dp_mst_port *port;struct intel_dp *mst_port;
Signature · 1 line
2.25.1
PATCH v2 2/2 drm/dp_mst: Remove drm_dp_mst_has_audio()
Drive-by fix I noticed the other day - drm_dp_mst_has_audio() only ever made sense back when we still had to validate ports before accessing them in order to (attempt to) avoid NULL dereferences. Since we have proper reference counting that guarantees we always can safely access the MST port, there's no use in keeping this function around as all it does is validate the port pointer before checking the audio status.
Note - drm_dp_mst_port->has_audio is technically protected by drm_device->mode_config.connection_mutex, since it's only ever updated from drm_dp_mst_get_edid(). Additionally, we change the declaration for port in struct intel_connector to be properly typed, so we can directly access it.
Changes since v1:
* Change type of intel_connector->port in a separate patch - Sean Paul
--- drivers/gpu/drm/drm_dp_mst_topology.c | 21 ------------------- .../drm/i915/display/intel_display_debugfs.c | 10 ++------- drivers/gpu/drm/i915/display/intel_dp_mst.c | 3 +-- include/drm/drm_dp_mst_helper.h | 2 -- 4 files changed, 3 insertions(+), 33 deletions(-)
drivers/gpu/drm/drm_dp_mst_topology.c +0 -21
@@ -4063,27 +4063,6 @@ drm_dp_mst_detect_port(struct drm_connector *connector, }EXPORT_SYMBOL (drm_dp_mst_detect_port); -/** -* drm_dp_mst_port_has_audio() - Check whether port has audio capability or not -* @mgr: manager for this port -* @port: unverified pointer to a port. -* -* This returns whether the port supports audio or not. -*/ -bool drm_dp_mst_port_has_audio (struct drm_dp_mst_topology_mgr *mgr, -struct drm_dp_mst_port *port) -{ -bool ret = false; - - port =drm_dp_mst_topology_get_port_validated (mgr, port); -if (!port) -return ret; - ret = port->has_audio; -drm_dp_mst_topology_put_port (port); -return ret; -} -EXPORT_SYMBOL (drm_dp_mst_port_has_audio); -/** * drm_dp_mst_get_edid() - get EDID for an MST port * @connector: toplevel connector to get EDID for
drivers/gpu/drm/i915/display/intel_display_debugfs.c +2 -8
@@ -631,15 +631,9 @@ static void intel_dp_info(struct seq_file *m, }static void intel_dp_mst_info (struct seq_file *m, -struct intel_connector *intel_connector) +struct intel_connector *intel_connector) { -struct intel_encoder *intel_encoder =intel_attached_encoder (intel_connector); -struct intel_dp_mst_encoder *intel_mst = -enc_to_mst (intel_encoder); -struct intel_digital_port *intel_dig_port = intel_mst->primary; -struct intel_dp *intel_dp = &intel_dig_port->dp; -bool has_audio =drm_dp_mst_port_has_audio (&intel_dp->mst_mgr, - intel_connector->port); +bool has_audio = intel_connector->port->has_audio;seq_printf (m,"\taudio support: %s\n" ,yesno (has_audio)); }
drivers/gpu/drm/i915/display/intel_dp_mst.c +1 -2
@@ -114,8 +114,7 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder,if (intel_conn_state->force_audio ==HDMI_AUDIO_AUTO ) pipe_config->has_audio = -drm_dp_mst_port_has_audio (&intel_dp->mst_mgr, - connector->port); + connector->port->has_audio;else pipe_config->has_audio = intel_conn_state->force_audio ==HDMI_AUDIO_ON ;
include/drm/drm_dp_mst_helper.h +0 -2
@@ -732,8 +732,6 @@ drm_dp_mst_detect_port(struct drm_connector *connector,struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port); -bool drm_dp_mst_port_has_audio (struct drm_dp_mst_topology_mgr *mgr, -struct drm_dp_mst_port *port);struct edid *drm_dp_mst_get_edid (struct drm_connector *connector,struct drm_dp_mst_topology_mgr *mgr,struct drm_dp_mst_port *port);
Signature · 6 lines
2.25.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [v2,1/2] drm/i915/dp_mst: Cast intel_connector->port as drm_dp_mst_port
In reply to Lyude Paul== Series Details ==
== Series Details ==
Series: series starting with [v2,1/2] drm/i915/dp_mst: Cast intel_connector->port as drm_dp_mst_port
URL : https://patchwork.freedesktop.org/series/75569/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8264 -> Patchwork_17224
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/index.html
Known issues
------------
Here are the changes found in Patchwork_17224 that come from known issues:
### IGT changes ###
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s4-devices:
- fi-tgl-y: [FAIL][1] ([i915#1158]) -> [PASS][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/fi-tgl-y/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/fi-tgl-y/igt@[email protected]
* igt@i915_selftest@live@hangcheck:
- fi-icl-y: [INCOMPLETE][3] ([i915#1580]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/fi-icl-y/igt@i915_selftest@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/fi-icl-y/igt@i915_selftest@[email protected]
[i915#1158]: https://gitlab.freedesktop.org/drm/intel/issues/1158
[i915#1580]: https://gitlab.freedesktop.org/drm/intel/issues/1580
Participating hosts (53 -> 45)
------------------------------
Additional (1): fi-kbl-7560u
Missing (9): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-skl-lmem fi-byt-clapper fi-bdw-samus fi-kbl-r
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_8264 -> Patchwork_17224
CI-20190529: 20190529
CI_DRM_8264: e0104585f880a64d4a9b40803cf4fb51ab499f7c @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5573: 9c582425d6b4fc1de9fc2ffc8015cc6f0a0d3e98 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_17224: 1074d40fdfd265882144a6a7d878d8ed066151c1 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
1074d40fdfd2 drm/dp_mst: Remove drm_dp_mst_has_audio() 06b887718d43 drm/i915/dp_mst: Cast intel_connector->port as drm_dp_mst_port
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 lines · Lyude Paul
The only reason for having this cast as void * before was because we originally needed to use
drm_dp_mst_get_port_validated()and friends in order to (attempt to) safely access MST ports. However, we've since improved how reference counting works with ports and mstbs such that we can now rely ondrm_dp_mst_portstructs remaining in memory for as long as the driver needs. This means we don't really need to cast this as void* anymore, and can just access the struct directly.
To/from void* does not need a cast in C anyway. ;)
Quoted 22 lines
We'll also need this for the next commit, so that we can remove
drm_dp_mst_port_has_audio().Signed-off-by Lyude Paul <[email protected]>Reviewed-by Sean Paul <[email protected]>--- drivers/gpu/drm/i915/display/intel_display_types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/display/intel_display_types.h +1
-1@@ -438,7 +438,7 @@ struct intel_connector {state of connector->polled in case hotplug storm detection changes it */ u8 polled; -void *port;/* store this opaque as its illegal to dereference it */ +struct drm_dp_mst_port *port;struct intel_dp *mst_port;
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Patchwork
CI[Intel-gfx] ✓ Fi.CI.IGT: success for series starting with [v2,1/2] drm/i915/dp_mst: Cast intel_connector->port as drm_dp_mst_port
In reply to Lyude Paul== Series Details ==
== Series Details ==
Series: series starting with [v2,1/2] drm/i915/dp_mst: Cast intel_connector->port as drm_dp_mst_port
URL : https://patchwork.freedesktop.org/series/75569/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8264_full -> Patchwork_17224_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_17224_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_workarounds@suspend-resume-fd:
- shard-kbl: [PASS][1] -> [DMESG-WARN][2] ([i915#180]) +2 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-kbl3/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/shard-kbl2/igt@[email protected]
* igt@i915_selftest@live@requests:
- shard-tglb: [PASS][3] -> [INCOMPLETE][4] ([i915#1531])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-tglb1/igt@i915_selftest@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/shard-tglb1/igt@i915_selftest@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-128x42-sliding:
- shard-apl: [PASS][5] -> [FAIL][6] ([i915#54] / [i915#95])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-apl4/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/shard-apl3/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-256x256-offscreen:
- shard-skl: [PASS][7] -> [FAIL][8] ([i915#54])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-skl3/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/shard-skl9/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-apl: [PASS][9] -> [DMESG-WARN][10] ([i915#180])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-apl7/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/shard-apl6/igt@[email protected]
* igt@kms_hdr@bpc-switch-suspend:
- shard-skl: [PASS][11] -> [FAIL][12] ([i915#1188])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-skl6/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/shard-skl7/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [PASS][13] -> [FAIL][14] ([fdo#108145] / [i915#265]) +1 similar issue
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-skl6/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/shard-skl4/igt@[email protected]
* igt@kms_psr@psr2_cursor_mmap_gtt:
- shard-iclb: [PASS][15] -> [SKIP][16] ([fdo#109441])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_gtt.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/shard-iclb4/igt@kms_psr@psr2_cursor_mmap_gtt.html
#### Possible fixes ####
* {igt@gem_ctx_isolation@preservation-s3@rcs0}:
- shard-apl: [DMESG-WARN][17] ([i915#180]) -> [PASS][18] +4 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-apl6/igt@gem_ctx_isolation@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/shard-apl3/igt@gem_ctx_isolation@[email protected]
* igt@gem_exec_balancer@hang:
- shard-tglb: [FAIL][19] ([i915#1277]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-tglb6/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/shard-tglb8/igt@[email protected]
* igt@i915_pm_rpm@basic-pci-d3-state:
- shard-skl: [FAIL][21] ([i915#138]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-skl5/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/shard-skl1/igt@[email protected]
* igt@i915_selftest@live@blt:
- shard-snb: [DMESG-FAIL][23] ([i915#1409]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-snb4/igt@i915_selftest@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/shard-snb6/igt@i915_selftest@[email protected]
* igt@i915_suspend@fence-restore-tiled2untiled:
- shard-skl: [INCOMPLETE][25] ([i915#69]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-skl3/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/shard-skl9/igt@[email protected]
* igt@kms_fbcon_fbt@fbc-suspend:
- shard-kbl: [DMESG-WARN][27] ([i915#180] / [i915#93] / [i915#95]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-kbl1/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/shard-kbl2/igt@[email protected]
* igt@kms_flip@2x-plain-flip-ts-check:
- shard-glk: [FAIL][29] ([i915#34]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-glk5/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/shard-glk9/igt@[email protected]
* igt@kms_flip@flip-vs-expired-vblank:
- shard-apl: [FAIL][31] ([i915#79]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-apl4/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/shard-apl1/igt@[email protected]
* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-kbl: [DMESG-WARN][33] ([i915#180]) -> [PASS][34] +2 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-kbl3/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/shard-kbl6/igt@[email protected]
* igt@kms_hdr@bpc-switch-dpms:
- shard-skl: [FAIL][35] ([i915#1188]) -> [PASS][36] +1 similar issue
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-skl4/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/shard-skl4/igt@[email protected]
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
- shard-snb: [DMESG-WARN][37] ([i915#42]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-snb6/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/shard-snb5/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min:
- shard-skl: [FAIL][39] ([fdo#108145] / [i915#265]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-skl8/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/shard-skl9/igt@[email protected]
* igt@kms_plane_lowres@pipe-a-tiling-none:
- shard-kbl: [DMESG-WARN][41] ([i915#165] / [i915#78]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-kbl2/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/shard-kbl4/igt@[email protected]
* igt@kms_psr@psr2_primary_mmap_gtt:
- shard-iclb: [SKIP][43] ([fdo#109441]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-iclb5/igt@kms_psr@psr2_primary_mmap_gtt.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/shard-iclb2/igt@kms_psr@psr2_primary_mmap_gtt.html
* igt@kms_setmode@basic:
- shard-apl: [FAIL][45] ([i915#31]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-apl7/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/shard-apl4/igt@[email protected]
- shard-kbl: [FAIL][47] ([i915#31]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-kbl4/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/shard-kbl7/igt@[email protected]
* igt@kms_vblank@pipe-b-ts-continuation-suspend:
- shard-kbl: [INCOMPLETE][49] ([i915#155]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-kbl4/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/shard-kbl7/igt@[email protected]
* {igt@perf@blocking-parameterized}:
- shard-iclb: [FAIL][51] ([i915#1542]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8264/shard-iclb8/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17224/shard-iclb1/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1277]: https://gitlab.freedesktop.org/drm/intel/issues/1277
[i915#138]: https://gitlab.freedesktop.org/drm/intel/issues/138
[i915#1409]: https://gitlab.freedesktop.org/drm/intel/issues/1409
[i915#1531]: https://gitlab.freedesktop.org/drm/intel/issues/1531
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#155]: https://gitlab.freedesktop.org/drm/intel/issues/155
[i915#165]: https://gitlab.freedesktop.org/drm/intel/issues/165
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#34]: https://gitlab.freedesktop.org/drm/intel/issues/34
[i915#42]: https://gitlab.freedesktop.org/drm/intel/issues/42
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#69]: https://gitlab.freedesktop.org/drm/intel/issues/69
[i915#78]: https://gitlab.freedesktop.org/drm/intel/issues/78
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#93]: https://gitlab.freedesktop.org/drm/intel/issues/93
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_8264 -> Patchwork_17224
CI-20190529: 20190529
CI_DRM_8264: e0104585f880a64d4a9b40803cf4fb51ab499f7c @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5573: 9c582425d6b4fc1de9fc2ffc8015cc6f0a0d3e98 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_17224: 1074d40fdfd265882144a6a7d878d8ed066151c1 @ 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_17224/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx