[Intel-gfx] [PATCH] drm/i915: Don't reject primayr plane windowing with color keying enabled on SKL+

[Ville Syrjälä]

On Mon, Jan 18, 2016 at 04:20:29PM +0200, Ville Syrjälä wrote:
> On Fri, Jan 15, 2016 at 03:22:08PM -0800, Matt Roper wrote:
> > On Fri, Jan 15, 2016 at 08:46:53PM +0200, ville.syrjala at linux.intel.com wrote:
> > > From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > > 
> > > On SKL+ plane scaling is mutually exclusive with color keying. The code
> > > check for this, but during some refactoring the code got changed to
> > > also reject primary plane windowing when color keying is used. There is
> > > no such restriction in the hardware, so restore the original logic.
> > > 
> > > Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> > > Fixes: 061e4b8d650a ("drm/i915: clean up atomic plane check functions, v2.")
> > > Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > 
> > s/primayr/primary in your headline, but otherwise
> > 
> > Reviewed-by: Matt Roper <matthew.d.roper at intel.com>
> > 
> > Still waiting for CI to run the BAT on this...
> 
> CI didn't scream. so pushed to dinq with the typo fixed.
> Thanks for the reviews.

Oh and added cc:stable when pushing.

> 
> > 
> > 
> > Matt
> > 
> > > ---
> > >  drivers/gpu/drm/i915/intel_display.c | 11 ++++++-----
> > >  1 file changed, 6 insertions(+), 5 deletions(-)
> > > 
> > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > > index a726c5e91220..7bc56e217ecc 100644
> > > --- a/drivers/gpu/drm/i915/intel_display.c
> > > +++ b/drivers/gpu/drm/i915/intel_display.c
> > > @@ -14019,11 +14019,12 @@ intel_check_primary_plane(struct drm_plane *plane,
> > >  	int max_scale = DRM_PLANE_HELPER_NO_SCALING;
> > >  	bool can_position = false;
> > >  
> > > -	/* use scaler when colorkey is not required */
> > > -	if (INTEL_INFO(plane->dev)->gen >= 9 &&
> > > -	    state->ckey.flags == I915_SET_COLORKEY_NONE) {
> > > -		min_scale = 1;
> > > -		max_scale = skl_max_scale(to_intel_crtc(crtc), crtc_state);
> > > +	if (INTEL_INFO(plane->dev)->gen >= 9) {
> > > +		/* use scaler when colorkey is not required */
> > > +		if (state->ckey.flags == I915_SET_COLORKEY_NONE) {
> > > +			min_scale = 1;
> > > +			max_scale = skl_max_scale(to_intel_crtc(crtc), crtc_state);
> > > +		}
> > >  		can_position = true;
> > >  	}
> > >  
> > > -- 
> > > 2.4.10
> > > 
> > > _______________________________________________
> > > Intel-gfx mailing list
> > > Intel-gfx at lists.freedesktop.org
> > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> > 
> > -- 
> > Matt Roper
> > Graphics Software Engineer
> > IoTG Platform Enabling & Development
> > Intel Corporation
> > (916) 356-2795
> 
> -- 
> Ville Syrjälä
> Intel OTC
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC