[natty] UBUNTU: SAUCE: (no-up) [PATCH 1/2] drm/i915: don't enable plane, pipe and PLL prematurely

[Andy Whitcroft]

On Fri, Nov 04, 2011 at 12:52:31PM -0400, Jose Plans wrote:
> 

> From 6f429dca81e9be173655302ea7252906d1291321 Mon Sep 17 00:00:00 2001
> From: Jose Plans <jose.plans at canonical.com>
> Date: Thu, 20 Oct 2011 19:05:53 +0000
> Subject: [natty] UBUNTU: SAUCE: (no-up) [PATCH 1/2] drm/i915: don't enable plane, pipe and PLL prematurely

As this is an upstream cherry-pick/backport we generally do not mark
those UBUNTU: SAUCE: and its already 'up' so (no-up) doesn't make sense
there.

> BugLink: http://bugs.launchpad.net/bugs/812638
> 
> On Ironlake+ we need to enable these in a specific order.
> 
> Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> 
> (cherry picked from commit 65993d64a31844ad444694efb2d159eb9c883e49)
> Signed-off by: Jose Plans <jose.plans at canonical.com>

Signed-off-by:

> ---
>  drivers/gpu/drm/i915/intel_display.c |    8 +++++---
>  1 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 841558b..49644cc 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -4322,9 +4322,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);

-apw