From: Jesse Barnes Date: Fri, 21 Feb 2014 21:13:39 +0000 (-0800) Subject: drm/i915: re-add locking around hw state readout X-Git-Tag: next-20140306~56^2~59 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8b687df4c305d3fd6b619dade83f95c4b860c74b;p=karo-tx-linux.git drm/i915: re-add locking around hw state readout To silence locking complaints. This was a rebase failure on my part in commit fa9fa083d0606cb323f6105c17702460ea0a6780 Author: Jesse Barnes Date: Tue Feb 11 15:28:56 2014 -0800 drm/i915: read out hw state earlier v2 Reported-by: Ville Syrjälä Signed-off-by: Jesse Barnes Reviewed-by: Ville Syrjälä Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 8d316c8bdf8f..924f3cee4bad 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -11042,7 +11042,9 @@ void intel_modeset_init(struct drm_device *dev) /* Just in case the BIOS is doing something questionable. */ intel_disable_fbc(dev); + mutex_lock(&dev->mode_config.mutex); intel_modeset_setup_hw_state(dev, false); + mutex_unlock(&dev->mode_config.mutex); } static void