From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH] drm/i915: Take modeset locks around intel_modeset_setup_hw_state() Date: Mon, 2 Dec 2013 11:08:06 +0200 Message-ID: <1385975286-25392-1-git-send-email-ville.syrjala@linux.intel.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org To: intel-gfx@lists.freedesktop.org Cc: pebolle@tiscali.nl, Daniel Vetter , Dave Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org =46rom: Ville Syrj=C3=A4l=C3=A4 Some lower level things get angry if we don't have modeset locks during intel_modeset_setup_hw_state(). Actually the resume and lid_notify codepaths alreday hold the locks, but the init codepath doesn't, so fix that. Signed-off-by: Ville Syrj=C3=A4l=C3=A4 --- Totally untested, but looks correct to me. drivers/gpu/drm/i915/intel_display.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i91= 5/intel_display.c index 080f6fd..114db51 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -11046,7 +11046,9 @@ void intel_modeset_gem_init(struct drm_device *= dev) =20 intel_setup_overlay(dev); =20 + drm_modeset_lock_all(dev); intel_modeset_setup_hw_state(dev, false); + drm_modeset_unlock_all(dev); } =20 void intel_modeset_cleanup(struct drm_device *dev) --=20 1.8.3.2