diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-13 16:58:39 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-13 17:04:14 +0100 |
| commit | e65d9305f528d4f354378690135ee8d1c60ec0a5 (patch) | |
| tree | 1ba41c9e13016987314004f9d239f036bf3cbf73 /drivers/gpu/drm | |
| parent | f7abfe8b281991c66406c42c1a6c6c9ee0daa0ff (diff) | |
| download | blackbird-op-linux-e65d9305f528d4f354378690135ee8d1c60ec0a5.tar.gz blackbird-op-linux-e65d9305f528d4f354378690135ee8d1c60ec0a5.zip | |
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 <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 1 |
1 files changed, 1 insertions, 0 deletions
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; |
