[Intel-gfx] [PATCH -v2 1/4] drm/i915: init sprites with univeral plane init function

[Daniel Vetter]

On Wed, Sep 03, 2014 at 11:18:27AM +0300, Ville Syrjälä wrote:
> On Tue, Sep 02, 2014 at 04:23:44PM -0300, Gustavo Padovan wrote:
> > From: Derek Foreman <derek.foreman at collabora.co.uk>
> > 
> > Really just for completeness - old init function ends up making the plane
> > exactly the same way due to the way the enums are set up.
> > 
> > Signed-off-by: Derek Foreman <derek.foreman at collabora.co.uk>
> 
> Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

Queued for -next, thanks for the patch.
-Daniel
> 
> > ---
> >  drivers/gpu/drm/i915/intel_sprite.c | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
> > index 0bdb00b..4cbe286 100644
> > --- a/drivers/gpu/drm/i915/intel_sprite.c
> > +++ b/drivers/gpu/drm/i915/intel_sprite.c
> > @@ -1375,10 +1375,10 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane)
> >  	intel_plane->plane = plane;
> >  	intel_plane->rotation = BIT(DRM_ROTATE_0);
> >  	possible_crtcs = (1 << pipe);
> > -	ret = drm_plane_init(dev, &intel_plane->base, possible_crtcs,
> > -			     &intel_plane_funcs,
> > -			     plane_formats, num_plane_formats,
> > -			     false);
> > +	ret = drm_universal_plane_init(dev, &intel_plane->base, possible_crtcs,
> > +				       &intel_plane_funcs,
> > +				       plane_formats, num_plane_formats,
> > +				       DRM_PLANE_TYPE_OVERLAY);
> >  	if (ret) {
> >  		kfree(intel_plane);
> >  		goto out;
> > -- 
> > 1.9.3
> > 
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> -- 
> Ville Syrjälä
> Intel OTC
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

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