Skip to content

Commit

Permalink
Revert "drm/i915: Lock mode_config.mutex in intel_display_resume."
Browse files Browse the repository at this point in the history
This reverts commit ea49c9a.

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 bbf35e9 ("drm/i915:
Pass atomic state to intel_audio_codec_enable, v2."), so it's
safe to revert this now.

Signed-off-by: Maarten Lankhorst <[email protected]>
Link: http://patchwork.freedesktop.org/patch/msgid/1491312168-18147-1-git-send-email-maarten.lankhorst@linux.intel.com
Reviewed-by: Daniel Vetter <[email protected]>
  • Loading branch information
mlankhorst committed Apr 12, 2017
1 parent 9cb9be0 commit c50b4bf
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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);
Expand Down

0 comments on commit c50b4bf

Please sign in to comment.