[Intel-gfx] [PATCH 1/9] drm/i915: Move num_pipes to intel info

[Daniel Vetter]

On Tue, Mar 19, 2013 at 12:25:23PM -0700, Jesse Barnes wrote:
> On Wed, 13 Mar 2013 11:21:00 -0700
> Ben Widawsky <ben at bwidawsk.net> wrote:
> 
> > Requested by Daniel.
> >  static const struct intel_device_info intel_i85x_info = {
> > -	.gen = 2, .is_i85x = 1, .is_mobile = 1,
> > +	.gen = 2, .is_i85x = 1, .is_mobile = 1, .num_pipes = 1,
> >  	.cursor_needs_physical = 1,
> >  	.has_overlay = 1, .overlay_needs_physical = 1,
> >  };
> 
> Most of these are wrong.  All mobile devices have 2 pipes.  All gen3+
> devices have 2 or 3 pipes.  Check the original code:
> 
> -	if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev))
> -		dev_priv->num_pipe = 3;
> -	else if (IS_MOBILE(dev) || !IS_GEN2(dev))
> -		dev_priv->num_pipe = 2;
> -	else
> -		dev_priv->num_pipe = 1;
> 
> >  static const struct intel_device_info intel_valleyview_d_info = {
> > -	.gen = 7,
> > +	.gen = 7, .num_pipes = 3,
> >  	.need_gfx_hws = 1, .has_hotplug = 1,
> >  	.has_fbc = 0,
> >  	.has_bsd_ring = 1,
> > @@ -290,7 +290,7 @@ static const struct intel_device_info intel_valleyview_d_info = {
> >  };
> 
> VLV only has 2 pipes on all variants.
> 
> Looks good otherwise.  With the pipe count fixes:
> 
> Reviewed-by: Jesse Barnes <jbarnes at virtuousgeek.org>

Merged v2 and smashed your r-b on top.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch