|
@@ -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);
|