[Intel-gfx] [PATCH 12/21] drm/i915: Ensure colorkey and scaling aren't enabled at same time

[Chris Wilson]

On Tue, Mar 17, 2015 at 03:16:01PM +0100, Daniel Vetter wrote:
> On Sat, Mar 14, 2015 at 10:55:37PM -0700, Chandra Konduru wrote:
> > Plane scaling and colorkey are mutually exclusive. Ensure scaling
> > isn't active at the time of enabling colorkey.
> > 
> > Signed-off-by: Chandra Konduru <chandra.konduru at intel.com>
> > ---
> >  drivers/gpu/drm/i915/intel_sprite.c |    6 ++++++
> >  1 file changed, 6 insertions(+)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
> > index c010528..0194390 100644
> > --- a/drivers/gpu/drm/i915/intel_sprite.c
> > +++ b/drivers/gpu/drm/i915/intel_sprite.c
> > @@ -319,6 +319,12 @@ skl_update_colorkey(struct drm_plane *drm_plane,
> >  	const int plane = intel_plane->plane;
> >  	u32 plane_ctl;
> >  
> > +	/* plane scaling and colorkey are mutually exclusive */
> > +	if (to_intel_plane_state(drm_plane->state)->scaler_id >= 0) {
> > +		DRM_ERROR("colorkey not allowed with scaler\n");
> > +		return -EINVAL;
> > +	}
> 
> Yeah this is a bit trouble because of the interactions between colorkey
> state in hw and the atomic scaler state in the atomic state structures.
> 
> Since colorkey isn't support with atomic atm anyway and we want to move
> towards atomic: Do we really have anyone who cares about legacy sprite
> ioctls on skl? If we'd just add a 

Yes. Current userspace uses sprites and colorkey.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre