On Thu, Dec 19, 2013 at 04:07:35PM +0100, Thomas Richter wrote: > Hi Daniel, hi folks, > > here is more debug output from the blank screen/hang on the i830 > based laptop: Quick shot in the dark: Can you please try the below diff? If that doesn't work please remove the locking in that function completely (i.e. remove the calls to drm_modset_lock|unlock_all). Thanks, Daniel diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 4d1357a32c41..66e62473f84d 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -11260,8 +11260,9 @@ void intel_modeset_gem_init(struct drm_device *dev) intel_setup_overlay(dev); - drm_modeset_lock_all(dev); drm_mode_config_reset(dev); + + drm_modeset_lock_all(dev); intel_modeset_setup_hw_state(dev, false); drm_modeset_unlock_all(dev); } -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
