* [Intel-gfx] [PATCH v2] drm/i915/hdcp: Remove drm_modeset_lock in intel_conn_to_vcpi
@ 2023-04-03 7:01 Suraj Kandpal
2023-04-03 14:09 ` Ville Syrjälä
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Suraj Kandpal @ 2023-04-03 7:01 UTC (permalink / raw)
To: intel-gfx; +Cc: ville.syrjala
Remove drm_modeset_lock in intel_conn_to_vcpi as we don't need it
anymore since all the required locks are taken in atomic check and
prepare phases.
--v2
-take lock if hdcp function is called from legacy path [Ville]
Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
---
drivers/gpu/drm/i915/display/intel_hdcp.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index 650232c4892b..65cfc4afbcaa 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -36,13 +36,16 @@ static int intel_conn_to_vcpi(struct intel_connector *connector)
struct drm_dp_mst_atomic_payload *payload;
struct drm_dp_mst_topology_state *mst_state;
int vcpi = 0;
+ bool is_locked;
/* For HDMI this is forced to be 0x0. For DP SST also this is 0x0. */
if (!connector->port)
return 0;
mgr = connector->port->mgr;
+ is_locked = drm_modeset_is_locked(&mgr->base.lock);
+ if (!is_locked)
+ drm_modeset_lock(&mgr->base.lock, NULL);
- drm_modeset_lock(&mgr->base.lock, NULL);
mst_state = to_drm_dp_mst_topology_state(mgr->base.state);
payload = drm_atomic_get_mst_payload_state(mst_state, connector->port);
if (drm_WARN_ON(mgr->dev, !payload))
@@ -54,7 +57,9 @@ static int intel_conn_to_vcpi(struct intel_connector *connector)
goto out;
}
out:
- drm_modeset_unlock(&mgr->base.lock);
+ if (!is_locked)
+ drm_modeset_unlock(&mgr->base.lock);
+
return vcpi;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Intel-gfx] [PATCH v2] drm/i915/hdcp: Remove drm_modeset_lock in intel_conn_to_vcpi
2023-04-03 7:01 [Intel-gfx] [PATCH v2] drm/i915/hdcp: Remove drm_modeset_lock in intel_conn_to_vcpi Suraj Kandpal
@ 2023-04-03 14:09 ` Ville Syrjälä
2023-04-04 5:19 ` Kandpal, Suraj
2023-04-03 14:27 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/hdcp: Remove drm_modeset_lock in intel_conn_to_vcpi (rev2) Patchwork
2023-04-03 19:25 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2 siblings, 1 reply; 5+ messages in thread
From: Ville Syrjälä @ 2023-04-03 14:09 UTC (permalink / raw)
To: Suraj Kandpal; +Cc: intel-gfx, ville.syrjala
On Mon, Apr 03, 2023 at 12:31:25PM +0530, Suraj Kandpal wrote:
> Remove drm_modeset_lock in intel_conn_to_vcpi as we don't need it
> anymore since all the required locks are taken in atomic check and
> prepare phases.
>
> --v2
> -take lock if hdcp function is called from legacy path [Ville]
>
> Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_hdcp.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index 650232c4892b..65cfc4afbcaa 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -36,13 +36,16 @@ static int intel_conn_to_vcpi(struct intel_connector *connector)
> struct drm_dp_mst_atomic_payload *payload;
> struct drm_dp_mst_topology_state *mst_state;
> int vcpi = 0;
> + bool is_locked;
>
> /* For HDMI this is forced to be 0x0. For DP SST also this is 0x0. */
> if (!connector->port)
> return 0;
> mgr = connector->port->mgr;
> + is_locked = drm_modeset_is_locked(&mgr->base.lock);
The fact that *someone* is holding the lock doesn't mean you
can just skip taking it yourself.
> + if (!is_locked)
> + drm_modeset_lock(&mgr->base.lock, NULL);
>
> - drm_modeset_lock(&mgr->base.lock, NULL);
> mst_state = to_drm_dp_mst_topology_state(mgr->base.state);
> payload = drm_atomic_get_mst_payload_state(mst_state, connector->port);
> if (drm_WARN_ON(mgr->dev, !payload))
> @@ -54,7 +57,9 @@ static int intel_conn_to_vcpi(struct intel_connector *connector)
> goto out;
> }
> out:
> - drm_modeset_unlock(&mgr->base.lock);
> + if (!is_locked)
> + drm_modeset_unlock(&mgr->base.lock);
> +
> return vcpi;
> }
>
> --
> 2.25.1
--
Ville Syrjälä
Intel
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/hdcp: Remove drm_modeset_lock in intel_conn_to_vcpi (rev2)
2023-04-03 7:01 [Intel-gfx] [PATCH v2] drm/i915/hdcp: Remove drm_modeset_lock in intel_conn_to_vcpi Suraj Kandpal
2023-04-03 14:09 ` Ville Syrjälä
@ 2023-04-03 14:27 ` Patchwork
2023-04-03 19:25 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2023-04-03 14:27 UTC (permalink / raw)
To: Suraj Kandpal; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 5523 bytes --]
== Series Details ==
Series: drm/i915/hdcp: Remove drm_modeset_lock in intel_conn_to_vcpi (rev2)
URL : https://patchwork.freedesktop.org/series/115240/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12958 -> Patchwork_115240v2
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/index.html
Participating hosts (37 -> 37)
------------------------------
Additional (1): fi-kbl-soraka
Missing (1): fi-snb-2520m
Known issues
------------
Here are the changes found in Patchwork_115240v2 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_huc_copy@huc-copy:
- fi-kbl-soraka: NOTRUN -> [SKIP][1] ([fdo#109271] / [i915#2190])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/fi-kbl-soraka/igt@gem_huc_copy@huc-copy.html
* igt@gem_lmem_swapping@basic:
- fi-kbl-soraka: NOTRUN -> [SKIP][2] ([fdo#109271] / [i915#4613]) +3 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/fi-kbl-soraka/igt@gem_lmem_swapping@basic.html
* igt@i915_selftest@live@gt_pm:
- fi-kbl-soraka: NOTRUN -> [DMESG-FAIL][3] ([i915#1886])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/fi-kbl-soraka/igt@i915_selftest@live@gt_pm.html
* igt@i915_selftest@live@mman:
- bat-rpls-1: [PASS][4] -> [TIMEOUT][5] ([i915#6794])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12958/bat-rpls-1/igt@i915_selftest@live@mman.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/bat-rpls-1/igt@i915_selftest@live@mman.html
* igt@kms_chamelium_frames@hdmi-crc-fast:
- fi-kbl-soraka: NOTRUN -> [SKIP][6] ([fdo#109271]) +16 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/fi-kbl-soraka/igt@kms_chamelium_frames@hdmi-crc-fast.html
* igt@kms_chamelium_hpd@common-hpd-after-suspend:
- fi-bsw-nick: NOTRUN -> [SKIP][7] ([fdo#109271]) +1 similar issue
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/fi-bsw-nick/igt@kms_chamelium_hpd@common-hpd-after-suspend.html
#### Possible fixes ####
* igt@i915_pm_rps@basic-api:
- bat-dg2-11: [FAIL][8] ([i915#8308]) -> [PASS][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12958/bat-dg2-11/igt@i915_pm_rps@basic-api.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/bat-dg2-11/igt@i915_pm_rps@basic-api.html
* igt@i915_selftest@live@hangcheck:
- fi-bsw-nick: [ABORT][10] ([i915#7913]) -> [PASS][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12958/fi-bsw-nick/igt@i915_selftest@live@hangcheck.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/fi-bsw-nick/igt@i915_selftest@live@hangcheck.html
* igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence@pipe-c-dp-1:
- bat-dg2-8: [FAIL][12] ([i915#7932]) -> [PASS][13]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12958/bat-dg2-8/igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence@pipe-c-dp-1.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/bat-dg2-8/igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence@pipe-c-dp-1.html
#### Warnings ####
* igt@i915_module_load@load:
- bat-atsm-1: [ABORT][14] ([i915#8219]) -> [ABORT][15] ([i915#8326])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12958/bat-atsm-1/igt@i915_module_load@load.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/bat-atsm-1/igt@i915_module_load@load.html
* igt@i915_selftest@live@slpc:
- bat-rpls-2: [DMESG-FAIL][16] ([i915#6367] / [i915#7913] / [i915#7996]) -> [DMESG-FAIL][17] ([i915#6367] / [i915#7913])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12958/bat-rpls-2/igt@i915_selftest@live@slpc.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/bat-rpls-2/igt@i915_selftest@live@slpc.html
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1886]: https://gitlab.freedesktop.org/drm/intel/issues/1886
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6794]: https://gitlab.freedesktop.org/drm/intel/issues/6794
[i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
[i915#7932]: https://gitlab.freedesktop.org/drm/intel/issues/7932
[i915#7996]: https://gitlab.freedesktop.org/drm/intel/issues/7996
[i915#8219]: https://gitlab.freedesktop.org/drm/intel/issues/8219
[i915#8308]: https://gitlab.freedesktop.org/drm/intel/issues/8308
[i915#8326]: https://gitlab.freedesktop.org/drm/intel/issues/8326
Build changes
-------------
* Linux: CI_DRM_12958 -> Patchwork_115240v2
CI-20190529: 20190529
CI_DRM_12958: f09f557ecb751519378d6d153a5b77afb14f7b43 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7233: 716520b469a2745e1882780f2aabbc88eb19332c @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_115240v2: f09f557ecb751519378d6d153a5b77afb14f7b43 @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
c923b6f4cc97 drm/i915/hdcp: Remove drm_modeset_lock in intel_conn_to_vcpi
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/index.html
[-- Attachment #2: Type: text/html, Size: 6797 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/hdcp: Remove drm_modeset_lock in intel_conn_to_vcpi (rev2)
2023-04-03 7:01 [Intel-gfx] [PATCH v2] drm/i915/hdcp: Remove drm_modeset_lock in intel_conn_to_vcpi Suraj Kandpal
2023-04-03 14:09 ` Ville Syrjälä
2023-04-03 14:27 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/hdcp: Remove drm_modeset_lock in intel_conn_to_vcpi (rev2) Patchwork
@ 2023-04-03 19:25 ` Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2023-04-03 19:25 UTC (permalink / raw)
To: Suraj Kandpal; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 16930 bytes --]
== Series Details ==
Series: drm/i915/hdcp: Remove drm_modeset_lock in intel_conn_to_vcpi (rev2)
URL : https://patchwork.freedesktop.org/series/115240/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12958_full -> Patchwork_115240v2_full
====================================================
Summary
-------
**WARNING**
Minor unknown changes coming with Patchwork_115240v2_full need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_115240v2_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
Participating hosts (8 -> 7)
------------------------------
Missing (1): shard-rkl0
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_115240v2_full:
### IGT changes ###
#### Warnings ####
* igt@kms_universal_plane@universal-plane-pageflip-windowed-pipe-d:
- shard-snb: [SKIP][1] ([fdo#109271]) -> [ABORT][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12958/shard-snb2/igt@kms_universal_plane@universal-plane-pageflip-windowed-pipe-d.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/shard-snb2/igt@kms_universal_plane@universal-plane-pageflip-windowed-pipe-d.html
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* igt@kms_plane_scaling@i915-max-src-size@pipe-a-hdmi-a-2:
- {shard-rkl}: [PASS][3] -> [FAIL][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12958/shard-rkl-6/igt@kms_plane_scaling@i915-max-src-size@pipe-a-hdmi-a-2.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/shard-rkl-4/igt@kms_plane_scaling@i915-max-src-size@pipe-a-hdmi-a-2.html
Known issues
------------
Here are the changes found in Patchwork_115240v2_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_fair@basic-pace-solo@rcs0:
- shard-apl: [PASS][5] -> [FAIL][6] ([i915#2842])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12958/shard-apl1/igt@gem_exec_fair@basic-pace-solo@rcs0.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/shard-apl6/igt@gem_exec_fair@basic-pace-solo@rcs0.html
- shard-glk: [PASS][7] -> [FAIL][8] ([i915#2842])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12958/shard-glk6/igt@gem_exec_fair@basic-pace-solo@rcs0.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/shard-glk6/igt@gem_exec_fair@basic-pace-solo@rcs0.html
* igt@gem_lmem_swapping@heavy-verify-random:
- shard-apl: NOTRUN -> [SKIP][9] ([fdo#109271] / [i915#4613])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/shard-apl4/igt@gem_lmem_swapping@heavy-verify-random.html
* igt@gem_lmem_swapping@massive-random:
- shard-glk: NOTRUN -> [SKIP][10] ([fdo#109271] / [i915#4613])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/shard-glk7/igt@gem_lmem_swapping@massive-random.html
* igt@gen9_exec_parse@allowed-single:
- shard-glk: [PASS][11] -> [ABORT][12] ([i915#5566])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12958/shard-glk1/igt@gen9_exec_parse@allowed-single.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/shard-glk6/igt@gen9_exec_parse@allowed-single.html
* igt@i915_pm_rpm@gem-execbuf-stress-pc8:
- shard-glk: NOTRUN -> [SKIP][13] ([fdo#109271]) +45 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/shard-glk7/igt@i915_pm_rpm@gem-execbuf-stress-pc8.html
* igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_gen12_mc_ccs:
- shard-apl: NOTRUN -> [SKIP][14] ([fdo#109271] / [i915#3886]) +4 similar issues
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/shard-apl4/igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-c-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc:
- shard-glk: NOTRUN -> [SKIP][15] ([fdo#109271] / [i915#3886]) +1 similar issue
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/shard-glk7/igt@kms_ccs@pipe-c-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_plane_scaling@planes-downscale-factor-0-5-upscale-0-25@pipe-c-dp-1:
- shard-apl: NOTRUN -> [SKIP][16] ([fdo#109271]) +76 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/shard-apl7/igt@kms_plane_scaling@planes-downscale-factor-0-5-upscale-0-25@pipe-c-dp-1.html
* igt@kms_psr2_sf@cursor-plane-move-continuous-exceed-sf:
- shard-apl: NOTRUN -> [SKIP][17] ([fdo#109271] / [i915#658])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/shard-apl7/igt@kms_psr2_sf@cursor-plane-move-continuous-exceed-sf.html
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-big-fb:
- shard-glk: NOTRUN -> [SKIP][18] ([fdo#109271] / [i915#658])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/shard-glk7/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-big-fb.html
* igt@kms_writeback@writeback-pixel-formats:
- shard-apl: NOTRUN -> [SKIP][19] ([fdo#109271] / [i915#2437])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/shard-apl7/igt@kms_writeback@writeback-pixel-formats.html
#### Possible fixes ####
* igt@gem_barrier_race@remote-request@rcs0:
- {shard-tglu}: [ABORT][20] ([i915#8211]) -> [PASS][21]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12958/shard-tglu-8/igt@gem_barrier_race@remote-request@rcs0.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/shard-tglu-5/igt@gem_barrier_race@remote-request@rcs0.html
* igt@gem_exec_fair@basic-none@bcs0:
- {shard-rkl}: [FAIL][22] ([i915#2842]) -> [PASS][23] +1 similar issue
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12958/shard-rkl-2/igt@gem_exec_fair@basic-none@bcs0.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/shard-rkl-3/igt@gem_exec_fair@basic-none@bcs0.html
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-apl: [FAIL][24] ([i915#2842]) -> [PASS][25]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12958/shard-apl2/igt@gem_exec_fair@basic-pace-share@rcs0.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/shard-apl3/igt@gem_exec_fair@basic-pace-share@rcs0.html
* igt@gem_exec_suspend@basic-s4-devices@smem:
- {shard-tglu}: [ABORT][26] ([i915#7975]) -> [PASS][27]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12958/shard-tglu-10/igt@gem_exec_suspend@basic-s4-devices@smem.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/shard-tglu-7/igt@gem_exec_suspend@basic-s4-devices@smem.html
* igt@gem_mmap_offset@clear@smem0:
- {shard-dg1}: [DMESG-WARN][28] ([i915#8304]) -> [PASS][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12958/shard-dg1-14/igt@gem_mmap_offset@clear@smem0.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/shard-dg1-17/igt@gem_mmap_offset@clear@smem0.html
* igt@gen9_exec_parse@allowed-single:
- shard-apl: [ABORT][30] ([i915#5566]) -> [PASS][31]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12958/shard-apl2/igt@gen9_exec_parse@allowed-single.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/shard-apl4/igt@gen9_exec_parse@allowed-single.html
* igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-hdmi-a:
- {shard-dg1}: [SKIP][32] ([i915#1937]) -> [PASS][33]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12958/shard-dg1-15/igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-hdmi-a.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/shard-dg1-14/igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-hdmi-a.html
* igt@i915_pm_rpm@dpms-non-lpsp:
- {shard-rkl}: [SKIP][34] ([i915#1397]) -> [PASS][35]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12958/shard-rkl-7/igt@i915_pm_rpm@dpms-non-lpsp.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/shard-rkl-2/igt@i915_pm_rpm@dpms-non-lpsp.html
* igt@i915_pm_rpm@modeset-non-lpsp-stress:
- {shard-dg1}: [SKIP][36] ([i915#1397]) -> [PASS][37]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12958/shard-dg1-14/igt@i915_pm_rpm@modeset-non-lpsp-stress.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/shard-dg1-17/igt@i915_pm_rpm@modeset-non-lpsp-stress.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-glk: [FAIL][38] ([i915#2346]) -> [PASS][39]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12958/shard-glk5/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/shard-glk7/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
* igt@kms_flip@flip-vs-suspend-interruptible@b-dp1:
- shard-apl: [ABORT][40] ([i915#180]) -> [PASS][41]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12958/shard-apl6/igt@kms_flip@flip-vs-suspend-interruptible@b-dp1.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_115240v2/shard-apl7/igt@kms_flip@flip-vs-suspend-interruptible@b-dp1.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109307]: https://bugs.freedesktop.org/show_bug.cgi?id=109307
[fdo#109313]: https://bugs.freedesktop.org/show_bug.cgi?id=109313
[fdo#109314]: https://bugs.freedesktop.org/show_bug.cgi?id=109314
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#110723]: https://bugs.freedesktop.org/show_bug.cgi?id=110723
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111644]: https://bugs.freedesktop.org/show_bug.cgi?id=111644
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#112054]: https://bugs.freedesktop.org/show_bug.cgi?id=112054
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1825]: https://gitlab.freedesktop.org/drm/intel/issues/1825
[i915#1937]: https://gitlab.freedesktop.org/drm/intel/issues/1937
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2437]: https://gitlab.freedesktop.org/drm/intel/issues/2437
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587
[i915#2658]: https://gitlab.freedesktop.org/drm/intel/issues/2658
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2681]: https://gitlab.freedesktop.org/drm/intel/issues/2681
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2856]: https://gitlab.freedesktop.org/drm/intel/issues/2856
[i915#3023]: https://gitlab.freedesktop.org/drm/intel/issues/3023
[i915#3116]: https://gitlab.freedesktop.org/drm/intel/issues/3116
[i915#315]: https://gitlab.freedesktop.org/drm/intel/issues/315
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299
[i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
[i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458
[i915#3539]: https://gitlab.freedesktop.org/drm/intel/issues/3539
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3591]: https://gitlab.freedesktop.org/drm/intel/issues/3591
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3734]: https://gitlab.freedesktop.org/drm/intel/issues/3734
[i915#3742]: https://gitlab.freedesktop.org/drm/intel/issues/3742
[i915#3840]: https://gitlab.freedesktop.org/drm/intel/issues/3840
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4213]: https://gitlab.freedesktop.org/drm/intel/issues/4213
[i915#4215]: https://gitlab.freedesktop.org/drm/intel/issues/4215
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4349]: https://gitlab.freedesktop.org/drm/intel/issues/4349
[i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4812]: https://gitlab.freedesktop.org/drm/intel/issues/4812
[i915#4818]: https://gitlab.freedesktop.org/drm/intel/issues/4818
[i915#4833]: https://gitlab.freedesktop.org/drm/intel/issues/4833
[i915#4852]: https://gitlab.freedesktop.org/drm/intel/issues/4852
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5288]: https://gitlab.freedesktop.org/drm/intel/issues/5288
[i915#5289]: https://gitlab.freedesktop.org/drm/intel/issues/5289
[i915#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#5439]: https://gitlab.freedesktop.org/drm/intel/issues/5439
[i915#5563]: https://gitlab.freedesktop.org/drm/intel/issues/5563
[i915#5566]: https://gitlab.freedesktop.org/drm/intel/issues/5566
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6230]: https://gitlab.freedesktop.org/drm/intel/issues/6230
[i915#6268]: https://gitlab.freedesktop.org/drm/intel/issues/6268
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6590]: https://gitlab.freedesktop.org/drm/intel/issues/6590
[i915#6768]: https://gitlab.freedesktop.org/drm/intel/issues/6768
[i915#6946]: https://gitlab.freedesktop.org/drm/intel/issues/6946
[i915#7116]: https://gitlab.freedesktop.org/drm/intel/issues/7116
[i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
[i915#7697]: https://gitlab.freedesktop.org/drm/intel/issues/7697
[i915#7711]: https://gitlab.freedesktop.org/drm/intel/issues/7711
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#7975]: https://gitlab.freedesktop.org/drm/intel/issues/7975
[i915#8011]: https://gitlab.freedesktop.org/drm/intel/issues/8011
[i915#8211]: https://gitlab.freedesktop.org/drm/intel/issues/8211
[i915#8292]: https://gitlab.freedesktop.org/drm/intel/issues/8292
[i915#8304]: https://gitlab.freedesktop.org/drm/intel/issues/8304
Build changes
-------------
* Linux: CI_DRM_12958 -> Patchwork_115240v2
CI-20190529: 20190529
CI_DRM_12958: f09f557ecb751519378d6d153a5b77afb14f7b43 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7233: 716520b469a2745e1882780f2aabbc88eb19332c @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_115240v2: f09f557ecb751519378d6d153a5b77afb14f7b43 @ 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_115240v2/index.html
[-- Attachment #2: Type: text/html, Size: 13661 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Intel-gfx] [PATCH v2] drm/i915/hdcp: Remove drm_modeset_lock in intel_conn_to_vcpi
2023-04-03 14:09 ` Ville Syrjälä
@ 2023-04-04 5:19 ` Kandpal, Suraj
0 siblings, 0 replies; 5+ messages in thread
From: Kandpal, Suraj @ 2023-04-04 5:19 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx, Syrjala, Ville
> -----Original Message-----
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Sent: Monday, April 3, 2023 7:39 PM
> To: Kandpal, Suraj <suraj.kandpal@intel.com>
> Cc: intel-gfx@lists.freedesktop.org; Syrjala, Ville <ville.syrjala@intel.com>
> Subject: Re: [Intel-gfx] [PATCH v2] drm/i915/hdcp: Remove
> drm_modeset_lock in intel_conn_to_vcpi
>
> On Mon, Apr 03, 2023 at 12:31:25PM +0530, Suraj Kandpal wrote:
> > Remove drm_modeset_lock in intel_conn_to_vcpi as we don't need it
> > anymore since all the required locks are taken in atomic check and
> > prepare phases.
> >
> > --v2
> > -take lock if hdcp function is called from legacy path [Ville]
> >
> > Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
> > ---
> > drivers/gpu/drm/i915/display/intel_hdcp.c | 9 +++++++--
> > 1 file changed, 7 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c
> > b/drivers/gpu/drm/i915/display/intel_hdcp.c
> > index 650232c4892b..65cfc4afbcaa 100644
> > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> > @@ -36,13 +36,16 @@ static int intel_conn_to_vcpi(struct intel_connector
> *connector)
> > struct drm_dp_mst_atomic_payload *payload;
> > struct drm_dp_mst_topology_state *mst_state;
> > int vcpi = 0;
> > + bool is_locked;
> >
> > /* For HDMI this is forced to be 0x0. For DP SST also this is 0x0. */
> > if (!connector->port)
> > return 0;
> > mgr = connector->port->mgr;
> > + is_locked = drm_modeset_is_locked(&mgr->base.lock);
>
> The fact that *someone* is holding the lock doesn't mean you can just skip
> taking it yourself.
>
So the reason for doing this here is that if we come here through atomic path
The locks will already be taken for us because of which we wont need to lock but
As you correctly pointed out int the last version that hdcp functions can be called through a legacy path
and this condition is to satisfy that path so we end up taking a lock then
Regards,
Suraj Kandpal
> > + if (!is_locked)
> > + drm_modeset_lock(&mgr->base.lock, NULL);
> >
> > - drm_modeset_lock(&mgr->base.lock, NULL);
> > mst_state = to_drm_dp_mst_topology_state(mgr->base.state);
> > payload = drm_atomic_get_mst_payload_state(mst_state,
> connector->port);
> > if (drm_WARN_ON(mgr->dev, !payload)) @@ -54,7 +57,9 @@ static
> int
> > intel_conn_to_vcpi(struct intel_connector *connector)
> > goto out;
> > }
> > out:
> > - drm_modeset_unlock(&mgr->base.lock);
> > + if (!is_locked)
> > + drm_modeset_unlock(&mgr->base.lock);
> > +
> > return vcpi;
> > }
> >
> > --
> > 2.25.1
>
> --
> Ville Syrjälä
> Intel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-04-04 5:19 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-03 7:01 [Intel-gfx] [PATCH v2] drm/i915/hdcp: Remove drm_modeset_lock in intel_conn_to_vcpi Suraj Kandpal
2023-04-03 14:09 ` Ville Syrjälä
2023-04-04 5:19 ` Kandpal, Suraj
2023-04-03 14:27 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/hdcp: Remove drm_modeset_lock in intel_conn_to_vcpi (rev2) Patchwork
2023-04-03 19:25 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.