On Fri, Jan 25, 2019 at 08:38:46PM +0200, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > We're incorrectly masking off the R/V channel enable bit from > KEYMSK. Fix it up. > > Cc: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx> > Cc: Matt Roper <matthew.d.roper@xxxxxxxxx> > Fixes: b20815255693 ("drm/i915: Add plane alpha blending support, v2.") > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> The "srckey" terminology in the headline is a bit confusing since the channel mask applies to both "destination colorkey" and "source colorkey" behavior. Otherwise, Reviewed-by: Matt Roper <matthew.d.roper@xxxxxxxxx> Out of curiousity, has there ever been a userspace consumer of source colorkey? I know SNA uses destination colorkey (for Xv), but not source colorkey. And afaik, UXA never did any colorkeying through the sprite interface at all. Matt > --- > drivers/gpu/drm/i915/intel_sprite.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c > index b02d3d9809e3..cd42e81f8a90 100644 > --- a/drivers/gpu/drm/i915/intel_sprite.c > +++ b/drivers/gpu/drm/i915/intel_sprite.c > @@ -493,7 +493,7 @@ skl_program_plane(struct intel_plane *plane, > > keymax = (key->max_value & 0xffffff) | PLANE_KEYMAX_ALPHA(alpha); > > - keymsk = key->channel_mask & 0x3ffffff; > + keymsk = key->channel_mask & 0x7ffffff; > if (alpha < 0xff) > keymsk |= PLANE_KEYMSK_ALPHA_ENABLE; > > -- > 2.19.2 > -- Matt Roper Graphics Software Engineer IoTG Platform Enabling & Development Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx