mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-05 11:36:41 +07:00
Revert "drm/i915: Lock mode_config.mutex in intel_display_resume."
This reverts commitea49c9acf2
. 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 commitbbf35e9def
("drm/i915: Pass atomic state to intel_audio_codec_enable, v2."), so it's safe to revert this now. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1491312168-18147-1-git-send-email-maarten.lankhorst@linux.intel.com Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
parent
9cb9be037c
commit
c50b4bf6e2
@ -15559,13 +15559,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) {
|
||||
@ -15581,7 +15574,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);
|
||||
|
Loading…
Reference in New Issue
Block a user