From: Chris Wilson Date: Mon, 13 Sep 2010 15:58:39 +0000 (+0100) Subject: drm/i915: Initialize intel_crtc->active X-Git-Tag: v2.6.37-rc1~92^2~28^2~129 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e65d9305f528d4f354378690135ee8d1c60ec0a5;p=karo-tx-linux.git drm/i915: Initialize intel_crtc->active Fix a regression in the previous regression fix... In order to turn off the pipes entirely upon the first modeset, we pretend that BIOS (or earlier module incarnation) left them active. The first task performed by setup_initial_configuration() is to disable all pipes and so to avoid skipping that step and so to ensure a known configuration we need to mark all the crtcs as active. Signed-off-by: Chris Wilson --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index a54b701f867c..e4fd7a3a9ee6 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5201,6 +5201,7 @@ static void intel_crtc_init(struct drm_device *dev, int pipe) intel_crtc->cursor_addr = 0; intel_crtc->dpms_mode = -1; + intel_crtc->active = true; /* force the pipe off on setup_init_config */ if (HAS_PCH_SPLIT(dev)) { intel_helper_funcs.prepare = ironlake_crtc_prepare;