Skip to content

Commit

Permalink
drm/i915: don't enable plane, pipe and PLL prematurely
Browse files Browse the repository at this point in the history
On Ironlake+ we need to enable these in a specific order.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
  • Loading branch information
Jesse Barnes authored and Chris Wilson committed Jan 19, 2011
1 parent 01fe9db commit 65993d6
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -4222,9 +4222,11 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
pipeconf &= ~PIPECONF_DOUBLE_WIDE;
}

dspcntr |= DISPLAY_PLANE_ENABLE;
pipeconf |= PIPECONF_ENABLE;
dpll |= DPLL_VCO_ENABLE;
if (!HAS_PCH_SPLIT(dev)) {
dspcntr |= DISPLAY_PLANE_ENABLE;
pipeconf |= PIPECONF_ENABLE;
dpll |= DPLL_VCO_ENABLE;
}

DRM_DEBUG_KMS("Mode for pipe %c:\n", pipe == 0 ? 'A' : 'B');
drm_mode_debug_printmodeline(mode);
Expand Down

0 comments on commit 65993d6

Please sign in to comment.