diff mbox

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

Message ID 1409685827-29067-1-git-send-email-gustavo@padovan.org (mailing list archive)
State New, archived
Headers show

Commit Message

Gustavo Padovan Sept. 2, 2014, 7:23 p.m. UTC
From: Derek Foreman <derek.foreman@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@collabora.co.uk>
---
 drivers/gpu/drm/i915/intel_sprite.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Ville Syrjala Sept. 3, 2014, 8:18 a.m. UTC | #1
On Tue, Sep 02, 2014 at 04:23:44PM -0300, Gustavo Padovan wrote:
> From: Derek Foreman <derek.foreman@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@collabora.co.uk>

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  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@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter Sept. 3, 2014, 8:36 a.m. UTC | #2
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@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@collabora.co.uk>
> 
> Reviewed-by: Ville Syrjälä <ville.syrjala@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@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> -- 
> Ville Syrjälä
> Intel OTC
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
Daniel Vetter Sept. 3, 2014, 8:38 a.m. UTC | #3
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@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@collabora.co.uk>
> 
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Queued for -next, thanks for the patch. And patch 2 is already merged from
the previous round.
-Daniel
Daniel Vetter Sept. 3, 2014, 10:36 a.m. UTC | #4
On Wed, Sep 03, 2014 at 10:38:17AM +0200, Daniel Vetter wrote:
> 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@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@collabora.co.uk>
> > 
> > Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Queued for -next, thanks for the patch. And patch 2 is already merged from
> the previous round.

Actually I can't merge this patch since it's not authered by you, but is
missing your signed-off-by line. Please resend with that fixed, thanks.

If you handle a patch for the linux kernel, you _always_ have to add your
sob in accordance with the Developer's Certificate of Origin.
-Daniel
diff mbox

Patch

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;