From f169028def40722febf03758bd02e00eb0af4219 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Thu, 6 Dec 2012 22:59:01 +0100 Subject: [PATCH] drm/i915: again disable all outputs at load time This has been broken in the modeset rework and can lead to hangs of the display block, ultimately leading to the hw's untimely demise in a unrecoverable hang (on gen2/3 where gpu reset isn't available). v2: Rebase on top of 3.7. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=57495 Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_display.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 82267b2..419f939 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -8929,6 +8929,7 @@ void intel_modeset_init_hw(struct drm_device *dev) void intel_modeset_init(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; + struct drm_crtc *crtc; int i, ret; drm_mode_config_init(dev); @@ -8975,6 +8976,9 @@ void intel_modeset_init(struct drm_device *dev) /* Just disable it once at startup */ i915_disable_vga(dev); intel_setup_outputs(dev); + + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) + intel_set_mode(crtc, NULL, 0, 0, NULL); } static void -- 1.7.10.4