[Intel-gfx] [PATCH 25/71] drm/i915/chv: CHV doesn't have CRT output

[Daniel Vetter]

On Wed, Apr 09, 2014 at 01:28:23PM +0300, ville.syrjala at linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> No CRT output on CHV, so don't call intel_crt_init().
> 
> v2: Don't disable CRT on HAS.
> 
> FIXME: Split out the is_simulator check again, we need it for now to keep HAS
> going.

Fixme can be dropped, this is something I need to sort out when rebasing
internal.
-Daniel

> 
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com> (v1)
> Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> ---
>  drivers/gpu/drm/i915/intel_display.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 266d8fe..9b65a04 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -10989,7 +10989,7 @@ static void intel_setup_outputs(struct drm_device *dev)
>  
>  	intel_lvds_init(dev);
>  
> -	if (!IS_ULT(dev))
> +	if (!IS_ULT(dev) && !IS_CHERRYVIEW(dev))
>  		intel_crt_init(dev);
>  
>  	if (HAS_DDI(dev)) {
> -- 
> 1.8.3.2
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

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