From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 9/9] drm/i915: Enable pipe gamma for sprites Date: Thu, 21 Nov 2013 09:10:58 +0100 Message-ID: <20131121081058.GH27344@phenom.ffwll.local> References: <1384828358-31563-1-git-send-email-rodrigo.vivi@gmail.com> <1384828358-31563-10-git-send-email-rodrigo.vivi@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-ee0-f54.google.com (mail-ee0-f54.google.com [74.125.83.54]) by gabe.freedesktop.org (Postfix) with ESMTP id 1F5C3FD2FB for ; Thu, 21 Nov 2013 00:10:20 -0800 (PST) Received: by mail-ee0-f54.google.com with SMTP id e51so4266752eek.13 for ; Thu, 21 Nov 2013 00:10:20 -0800 (PST) Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: Rodrigo Vivi Cc: intel-gfx List-Id: intel-gfx@lists.freedesktop.org On Tue, Nov 19, 2013 at 09:42:55AM -0800, Rodrigo Vivi wrote: > Reviewed-by: Rodrigo Vivi > = > On Mon, Nov 18, 2013 at 6:32 PM, Rodrigo Vivi wr= ote: > > From: Ville Syrj=E4l=E4 > > > > We send the primary and cursor plane data through the gamma unit. > > In order to get matching output from sprites, also send the sprite > > data through the gamma unit. > > > > In the future we should add some properties to control this > > explicitly, and also add properties for the per-sprite gamma ramps > > what have you, but for now this seems like a reasonable thing to do. > > > > Signed-off-by: Ville Syrj=E4l=E4 > > Signed-off-by: Rodrigo Vivi Eventually we want testcases for this, but I think that's only really useful once we expose a "bypasss gamma" or similar property. And that is best done together with exposing all the other csc stuff I'd say. So merged. -Daniel > > --- > > drivers/gpu/drm/i915/i915_reg.h | 2 +- > > drivers/gpu/drm/i915/intel_sprite.c | 18 ++++++++++++++++++ > > 2 files changed, 19 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i91= 5_reg.h > > index 8f4916d..7b454d2 100644 > > --- a/drivers/gpu/drm/i915/i915_reg.h > > +++ b/drivers/gpu/drm/i915/i915_reg.h > > @@ -3745,7 +3745,7 @@ > > > > #define _SPACNTR (VLV_DISPLAY_BASE + 0x72180) > > #define SP_ENABLE (1<<31) > > -#define SP_GEAMMA_ENABLE (1<<30) > > +#define SP_GAMMA_ENABLE (1<<30) > > #define SP_PIXFORMAT_MASK (0xf<<26) > > #define SP_FORMAT_YUV422 (0<<26) > > #define SP_FORMAT_BGR565 (5<<26) > > diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915= /intel_sprite.c > > index 8afaad6..cb7ffd3 100644 > > --- a/drivers/gpu/drm/i915/intel_sprite.c > > +++ b/drivers/gpu/drm/i915/intel_sprite.c > > @@ -104,6 +104,12 @@ vlv_update_plane(struct drm_plane *dplane, struct = drm_crtc *crtc, > > break; > > } > > > > + /* > > + * Enable gamma to match primary/cursor plane behaviour. > > + * FIXME should be user controllable via propertiesa. > > + */ > > + sprctl |=3D SP_GAMMA_ENABLE; > > + > > if (obj->tiling_mode !=3D I915_TILING_NONE) > > sprctl |=3D SP_TILED; > > > > @@ -257,6 +263,12 @@ ivb_update_plane(struct drm_plane *plane, struct d= rm_crtc *crtc, > > BUG(); > > } > > > > + /* > > + * Enable gamma to match primary/cursor plane behaviour. > > + * FIXME should be user controllable via propertiesa. > > + */ > > + sprctl |=3D SPRITE_GAMMA_ENABLE; > > + > > if (obj->tiling_mode !=3D I915_TILING_NONE) > > sprctl |=3D SPRITE_TILED; > > > > @@ -453,6 +465,12 @@ ilk_update_plane(struct drm_plane *plane, struct d= rm_crtc *crtc, > > BUG(); > > } > > > > + /* > > + * Enable gamma to match primary/cursor plane behaviour. > > + * FIXME should be user controllable via propertiesa. > > + */ > > + dvscntr |=3D DVS_GAMMA_ENABLE; > > + > > if (obj->tiling_mode !=3D I915_TILING_NONE) > > dvscntr |=3D DVS_TILED; > > > > -- > > 1.8.3.1 > > > = > = > = > -- = > Rodrigo Vivi > Blog: http://blog.vivi.eng.br > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch