[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1385975286-25392-1-git-send-email-ville.syrjala@linux.intel.com>
Date: Mon, 2 Dec 2013 11:08:06 +0200
From: ville.syrjala@...ux.intel.com
To: intel-gfx@...ts.freedesktop.org
Cc: pebolle@...cali.nl, "Daniel Vetter" <daniel@...ll.ch>,
"Dave Airlie" <airlied@...hat.com>, linux-kernel@...r.kernel.org,
dri-devel@...ts.freedesktop.org
Subject: [PATCH] drm/i915: Take modeset locks around intel_modeset_setup_hw_state()
From: Ville Syrjälä <ville.syrjala@...ux.intel.com>
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älä <ville.syrjala@...ux.intel.com>
---
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/i915/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)
intel_setup_overlay(dev);
+ drm_modeset_lock_all(dev);
intel_modeset_setup_hw_state(dev, false);
+ drm_modeset_unlock_all(dev);
}
void intel_modeset_cleanup(struct drm_device *dev)
--
1.8.3.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists