From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: init sprites with univeral plane init function Date: Wed, 3 Sep 2014 15:44:24 +0200 Message-ID: <20140903134424.GR15520@phenom.ffwll.local> References: <20140903103648.GK15520@phenom.ffwll.local> <1409751500-27907-1-git-send-email-gustavo@padovan.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <1409751500-27907-1-git-send-email-gustavo@padovan.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Gustavo Padovan Cc: intel-gfx@lists.freedesktop.org, Derek Foreman , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On Wed, Sep 03, 2014 at 10:38:20AM -0300, Gustavo Padovan wrote: > From: Derek Foreman > > 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 > Signed-off-by: Gustavo Padovan 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 > -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch