Revert "drm/i915: Lock mode_config.mutex in intel_display_resume."
Subsystems (2)
PATCH 1/1 Revert "drm/i915: Lock mode_config.mutex in intel_display_resume."
This reverts commit ea49c9acf2db7082f0406bb3a570cc6bad37082b.
mode_config.mutex was originally added to fix WARNs in connector functions, but now that atomic nonblocking modeset support is included, we will likely never hold any any lock at all.
The WARN mentioned in commit bbf35e9defb9a6d1 ("drm/i915:
Pass atomic state to intel_audio_codec_enable, v2."), so it's safe to revert this now.
--- drivers/gpu/drm/i915/intel_display.c | 8 -------- 1 file changed, 8 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -8
@@ -15606,13 +15606,6 @@ void intel_display_resume(struct drm_device *dev)if (state) state->acquire_ctx = &ctx; -/* -* This is a cludge because with real atomic modeset mode_config.mutex -* won't be taken. Unfortunately some probed state like -* audio_codec_enable is still protected by mode_config.mutex, so lock -* it here for now. -*/ -mutex_lock (&dev->mode_config.mutex);drm_modeset_acquire_init (&ctx,0 );while (1 ) {
@@ -15628,7 +15621,6 @@ void intel_display_resume(struct drm_device *dev)drm_modeset_drop_locks (&ctx);drm_modeset_acquire_fini (&ctx); -mutex_unlock (&dev->mode_config.mutex);if (ret)DRM_ERROR ("Restoring old state failed with %i\n" , ret);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Revert "drm/i915: Lock mode_config.mutex in intel_display_resume."
== Series Details ==
== Series Details ==
Series: Revert "drm/i915: Lock mode_config.mutex in intel_display_resume."
URL : https://patchwork.freedesktop.org/series/22434/
State : success
== Summary ==
Series 22434v1 Revert "drm/i915: Lock mode_config.mutex in intel_display_resume."
https://patchwork.freedesktop.org/api/1.0/series/22434/revisions/1/mbox/
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-uc:
fail -> PASS (fi-snb-2600) fdo#100007
Test gem_exec_suspend:
Subgroup basic-s4-devices:
pass -> DMESG-WARN (fi-kbl-7560u) fdo#100125
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
fail -> PASS (fi-skl-6700k) fdo#100367fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fdo#100125 https://bugs.freedesktop.org/show_bug.cgi?id=100125
fdo#100367 https://bugs.freedesktop.org/show_bug.cgi?id=100367
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time: 432s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time: 430s fi-bsw-n3050 total:278 pass:239 dwarn:0 dfail:0 fail:0 skip:39 time: 582s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time: 515s fi-bxt-t5700 total:278 pass:258 dwarn:0 dfail:0 fail:0 skip:20 time: 537s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 409s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 409s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time: 424s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 483s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 464s fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 456s fi-kbl-7560u total:278 pass:267 dwarn:1 dfail:0 fail:0 skip:10 time: 567s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 457s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time: 575s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time: 463s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 495s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time: 432s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time: 531s fi-snb-2600 total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:29 time: 409s
fi-byt-j1900 failed to collect. IGT log at Patchwork_4394/fi-byt-j1900/igt.log fi-byt-n2820 failed to collect. IGT log at Patchwork_4394/fi-byt-n2820/igt.log
38a5db0d3643f519d86f42029b7a93e624807a71 drm-tip: 2017y-04m-04d-13h-24m-06s UTC integration manifest 6afe3a6 Revert "drm/i915: Lock mode_config.mutex in intel_display_resume."
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4394/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 11 lines · Maarten Lankhorst
This reverts commit
ea49c9acf2db7082f0406bb3a570cc6bad37082b.mode_config.mutex was originally added to fix WARNs in connector functions, but now that atomic nonblocking modeset support is included, we will likely never hold any any lock at all.
The WARN mentioned in commit
bbf35e9defb9a6d1("drm/i915:
Pass atomic state tointel_audio_codec_enable, v2."), so it's safe to revert this now.Signed-off-by Maarten Lankhorst <[email protected]>
I think you can push that right after the backmerge went out. -Daniel
Quoted 37 lines
--- drivers/gpu/drm/i915/intel_display.c | 8 -------- 1 file changed, 8 deletions(-)drivers/gpu/drm/i915/intel_display.c +0
-8@@ -15606,13 +15606,6 @@ void intel_display_resume(struct drm_device *dev)if (state) state->acquire_ctx = &ctx; -/* -* This is a cludge because with real atomic modeset mode_config.mutex -* won't be taken. Unfortunately some probed state like -* audio_codec_enable is still protected by mode_config.mutex, so lock -* it here for now. -*/ -mutex_lock (&dev->mode_config.mutex);drm_modeset_acquire_init (&ctx,0 );while (1 ) {@@ -15628,7 +15621,6 @@ void intel_display_resume(struct drm_device *dev)drm_modeset_drop_locks (&ctx);drm_modeset_acquire_fini (&ctx); -mutex_unlock (&dev->mode_config.mutex);if (ret)DRM_ERROR ("Restoring old state failed with %i\n" , ret);Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx