| Message ID | 1426896282-23215-13-git-send-email-chandra.konduru@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Mar 20, 2015 at 05:04:33PM -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@intel.com> I guess this is fine for now, but eventually we're going to need to get colorkey and other blending styles brought over to atomic...do you know if there's already someone working on that? Matt > --- > 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; > + } > + > I915_WRITE(PLANE_KEYVAL(pipe, plane), key->min_value); > I915_WRITE(PLANE_KEYMAX(pipe, plane), key->max_value); > I915_WRITE(PLANE_KEYMSK(pipe, plane), key->channel_mask); > -- > 1.7.9.5 >
> -----Original Message----- > From: Roper, Matthew D > Sent: Wednesday, March 25, 2015 10:22 AM > To: Konduru, Chandra > Cc: intel-gfx@lists.freedesktop.org; Vetter, Daniel; Conselvan De Oliveira, Ander > Subject: Re: [PATCH 12/21 v2] drm/i915: Ensure colorkey and scaling aren't > enabled at same time > > On Fri, Mar 20, 2015 at 05:04:33PM -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@intel.com> > > I guess this is fine for now, but eventually we're going to need to get colorkey > and other blending styles brought over to atomic...do you know if there's > already someone working on that? I do not know. > > > Matt > > > --- > > 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; > > + } > > + > > I915_WRITE(PLANE_KEYVAL(pipe, plane), key->min_value); > > I915_WRITE(PLANE_KEYMAX(pipe, plane), key->max_value); > > I915_WRITE(PLANE_KEYMSK(pipe, plane), key->channel_mask); > > -- > > 1.7.9.5 > > > > -- > Matt Roper > Graphics Software Engineer > IoTG Platform Enabling & Development > Intel Corporation > (916) 356-2795
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; + } + I915_WRITE(PLANE_KEYVAL(pipe, plane), key->min_value); I915_WRITE(PLANE_KEYMAX(pipe, plane), key->max_value); I915_WRITE(PLANE_KEYMSK(pipe, plane), key->channel_mask);
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@intel.com> --- drivers/gpu/drm/i915/intel_sprite.c | 6 ++++++ 1 file changed, 6 insertions(+)