[PATCH v3 04/11] drm/i915: move check of intel_crtc_cursor_set_obj() out

[Ville Syrjälä]

On Tue, Oct 07, 2014 at 05:47:52PM +0300, Ville Syrjälä wrote:
> On Wed, Sep 24, 2014 at 02:20:25PM -0300, Gustavo Padovan wrote:
> > From: Gustavo Padovan <gustavo.padovan at collabora.co.uk>
> > 
> > Move check inside intel_crtc_cursor_set_obj() to
> > intel_check_cursor_plane(), we only use it there so move them out to
> > make the merge of intel_crtc_cursor_set_obj() into
> > intel_check_cursor_plane() easier.
> > 
> > This is another step toward the atomic modesetting support and unification
> > of plane operations such pin/unpin of fb objects on i915.
> > 
> > v2: take Ville's comment: move crtc_{w,h} assignment a bit down in the
> > code
> > v3: take Ville's comment: kept only the restructuring changes, the rest of
> > the code was moved to a separated patch since it is a bug fix (we weren't
> > checking sizes when the fb was the same)
> > 
> > Signed-off-by: Gustavo Padovan <gustavo.padovan at collabora.co.uk>
> 
> Looks like the commit messages for patches 2 and 3 got somehow swapped
> around. With that fixed patches 2 and 3 get:

And make that patches 3 and 4 and we're actaully talking about the
correct two patches.

> Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> > ---
> >  drivers/gpu/drm/i915/intel_display.c | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index 20be2ed..f91a5b0 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -11928,9 +11928,6 @@ intel_check_cursor_plane(struct drm_plane *plane,
> >  	if (!obj)
> >  		return 0;
> >  
> > -	if (fb == crtc->cursor->fb)
> > -		return 0;
> > -
> >  	/* Check for which cursor types we support */
> >  	crtc_w = drm_rect_width(&state->orig_dst);
> >  	crtc_h = drm_rect_height(&state->orig_dst);
> > @@ -11945,6 +11942,9 @@ intel_check_cursor_plane(struct drm_plane *plane,
> >  		return -ENOMEM;
> >  	}
> >  
> > +	if (fb == crtc->cursor->fb)
> > +		return 0;
> > +
> >  	/* we only need to pin inside GTT if cursor is non-phy */
> >  	mutex_lock(&dev->struct_mutex);
> >  	if (!INTEL_INFO(dev)->cursor_needs_physical && obj->tiling_mode) {
> > -- 
> > 1.9.3
> > 
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/dri-devel
> 
> -- 
> Ville Syrjälä
> Intel OTC
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Ville Syrjälä
Intel OTC