Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c291be9d authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm/i915: Hold mode_config lock whilst changing mode for lastclose() 



Upon lastclose(), we switch back to the fbcon configuration. This
requires taking the mode_config lock in order to serialise the change
with output probing elsewhere.

Reported-by: default avatarOleksij Rempel <bug-track@fisher-privat.net>
References: https://bugs.freedesktop.org/show_bug.cgi?id=48652


Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: stable@kernel.org
Acked-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-Off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent f9bef081

drivers/gpu/drm/i915/intel_fb.c

+4 −0
Original line number Diff line number Diff line
@@ -279,6 +279,8 @@ void intel_fb_restore_mode(struct drm_device *dev) 
	struct drm_mode_config *config = &dev->mode_config;

	struct drm_plane *plane;



	mutex_lock(&dev->mode_config.mutex);



	ret = drm_fb_helper_restore_fbdev_mode(&dev_priv->fbdev->helper);

	if (ret)

		DRM_DEBUG("failed to restore crtc mode\n");
@@ -286,4 +288,6 @@ void intel_fb_restore_mode(struct drm_device *dev) 
	/* Be sure to shut off any planes that may be active */

	list_for_each_entry(plane, &config->plane_list, head)

		plane->funcs->disable_plane(plane);



	mutex_unlock(&dev->mode_config.mutex);

}