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

Commit 927a2f11 authored by Sean Paul's avatar Sean Paul Committed by Daniel Vetter
Browse files

drm/i915: Add lock on drm_helper_resume_force_mode 



i915_drm_thaw was not locking the mode_config lock when calling
drm_helper_resume_force_mode. When there were multiple wake sources,
this caused FDI training failure on SNB which in turn corrupted the
display.

Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: stable@kernel.org
Signed-Off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent e02f14cd

drivers/gpu/drm/i915/i915_drv.c

+2 −0
Original line number Diff line number Diff line
@@ -538,7 +538,9 @@ static int i915_drm_thaw(struct drm_device *dev) 
		drm_irq_install(dev);



		/* Resume the modeset for every activated CRTC */

		mutex_lock(&dev->mode_config.mutex);

		drm_helper_resume_force_mode(dev);

		mutex_unlock(&dev->mode_config.mutex);



		if (IS_IRONLAKE_M(dev))

			ironlake_enable_rc6(dev);