From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915/sprite: Always enable the scaler on IronLake Date: Mon, 16 Apr 2012 19:01:28 +0200 Message-ID: <20120416170128.GD4199@phenom.ffwll.local> References: <1334438066-11482-1-git-send-email-chris@chris-wilson.co.uk> <20120416080017.30ceb7b2@jbarnes-desktop> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by gabe.freedesktop.org (Postfix) with ESMTP id 4F5DB9F390 for ; Mon, 16 Apr 2012 10:00:33 -0700 (PDT) Received: by wgbdr12 with SMTP id dr12so4435362wgb.12 for ; Mon, 16 Apr 2012 10:00:32 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20120416080017.30ceb7b2@jbarnes-desktop> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Jesse Barnes Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Mon, Apr 16, 2012 at 08:00:17AM -0700, Jesse Barnes wrote: > On Sat, 14 Apr 2012 22:14:26 +0100 > Chris Wilson wrote: > > > As I do not see the output update without the scaler enabled on my > > i3-330m, always enable it. > > > > Signed-off-by: Chris Wilson > > Cc: Jesse Barnes > > --- > > drivers/gpu/drm/i915/intel_sprite.c | 5 +++-- > > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c > > index a831b7d..1baa903 100644 > > --- a/drivers/gpu/drm/i915/intel_sprite.c > > +++ b/drivers/gpu/drm/i915/intel_sprite.c > > @@ -236,7 +236,7 @@ ilk_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb, > > struct drm_i915_private *dev_priv = dev->dev_private; > > struct intel_plane *intel_plane = to_intel_plane(plane); > > int pipe = intel_plane->pipe, pixel_size; > > - u32 dvscntr, dvsscale = 0; > > + u32 dvscntr, dvsscale; > > > > dvscntr = I915_READ(DVSCNTR(pipe)); > > > > @@ -292,7 +292,8 @@ ilk_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb, > > > > intel_update_sprite_watermarks(dev, pipe, crtc_w, pixel_size); > > > > - if (crtc_w != src_w || crtc_h != src_h) > > + dvsscale = 0; > > + if (IS_GEN5(dev) || crtc_w != src_w || crtc_h != src_h) > > dvsscale = DVS_SCALE_ENABLE | (src_w << 16) | src_h; > > > > I915_WRITE(DVSSTRIDE(pipe), fb->pitches[0]); > > Funky... do you notice any difference in output (fuzziness or anything) > with the scaler enabled? Wonder if it's safe to enable for 1:1 scaling > on SNB as well. > > Acked-by: Jesse Barnes Queued for -next, thanks for the patch. -Daniel -- Daniel Vetter Mail: daniel@ffwll.ch Mobile: +41 (0)79 365 57 48