[Intel-gfx] [PATCH] drm/i915: fix up the edp power well check

[Daniel Vetter]

On Wed, May 29, 2013 at 07:56:11PM +0200, Daniel Vetter wrote:
> Now that we track the cpu transcoder we need accurately in the pipe
> config we can finally fix up the transcoder check. With the current
> code eDP on port D will be broken since we'd errornously cut the
> power.
> 
> For reference see
> 
> commit 2124b72e6283c4e84a55e71077fee91793f4c801
> Author: Paulo Zanoni <paulo.r.zanoni at intel.com>
> Date:   Fri Mar 22 14:07:23 2013 -0300
> 
>     drm/i915: don't disable the power well yet
> 
> Cc: Takashi Iwai <tiwai at suse.de>
> Cc: Paulo Zanoni <paulo.r.zanoni at intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>

Adding imre since he smashed his r-b onto the regressing commit.
-Daniel

> ---
>  drivers/gpu/drm/i915/intel_display.c |    6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 3db4ed2..1ee9e92 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -5809,12 +5809,8 @@ static void haswell_modeset_global_resources(struct drm_device *dev)
>  		/* Even the eDP panel fitter is outside the always-on well. */
>  		if (crtc->config.pch_pfit.size && crtc->base.enabled)
>  			enable = true;
> -	}
>  
> -	list_for_each_entry(encoder, &dev->mode_config.encoder_list,
> -			    base.head) {
> -		if (encoder->type != INTEL_OUTPUT_EDP &&
> -		    encoder->connectors_active)
> +		if (crtc->config.cpu_transcoder != TRANSCODER_EDP)
>  			enable = true;
>  	}
>  
> -- 
> 1.7.10.4
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch