From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: Don't try to use SPR_SCALE when we don't have a sprite scaler Date: Tue, 23 Oct 2012 16:45:33 +0200 Message-ID: <20121023144533.GQ24005@phenom.ffwll.local> References: <1350926367-2386-1-git-send-email-damien.lespiau@gmail.com> <20121023071603.34203807@jbarnes-desktop> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-we0-f177.google.com (mail-we0-f177.google.com [74.125.82.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 8FFE69F5F5 for ; Tue, 23 Oct 2012 07:44:31 -0700 (PDT) Received: by mail-we0-f177.google.com with SMTP id u50so2065519wey.36 for ; Tue, 23 Oct 2012 07:44:30 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20121023071603.34203807@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 Tue, Oct 23, 2012 at 07:16:03AM -0700, Jesse Barnes wrote: > On Mon, 22 Oct 2012 18:19:27 +0100 > Damien Lespiau wrote: > > > From: Damien Lespiau > > > > Haswell does not have a scaler in the sprite pipeline anymore, so let's > > ensure: > > 1/ We bail out of update_plate() when someone is trying to ask to > > display a scaled framebuffer, > > 2/ We never write to the nonexistent SPR_SCALE register > > > > Signed-off-by: Damien Lespiau > > --- > > drivers/gpu/drm/i915/intel_drv.h | 1 + > > drivers/gpu/drm/i915/intel_sprite.c | 14 +++++++++++++- > > 2 files changed, 14 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > > index 0942fb4..97c714d 100644 > > --- a/drivers/gpu/drm/i915/intel_drv.h > > +++ b/drivers/gpu/drm/i915/intel_drv.h > > @@ -221,6 +221,7 @@ struct intel_plane { > > struct drm_plane base; > > enum pipe pipe; > > struct drm_i915_gem_object *obj; > > + bool can_scale; > > int max_downscale; > > u32 lut_r[1024], lut_g[1024], lut_b[1024]; > > void (*update_plane)(struct drm_plane *plane, > > diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c > > index f2ca943..ccfaa6f 100644 > > --- a/drivers/gpu/drm/i915/intel_sprite.c > > +++ b/drivers/gpu/drm/i915/intel_sprite.c > > @@ -136,7 +136,8 @@ ivb_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb, > > I915_WRITE(SPRLINOFF(pipe), offset); > > } > > I915_WRITE(SPRSIZE(pipe), (crtc_h << 16) | crtc_w); > > - I915_WRITE(SPRSCALE(pipe), sprscale); > > + if (intel_plane->can_scale) > > + I915_WRITE(SPRSCALE(pipe), sprscale); > > I915_WRITE(SPRCTL(pipe), sprctl); > > I915_MODIFY_DISPBASE(SPRSURF(pipe), obj->gtt_offset); > > POSTING_READ(SPRSURF(pipe)); > > @@ -474,6 +475,12 @@ intel_update_plane(struct drm_plane *plane, struct drm_crtc *crtc, > > goto out; > > > > /* > > + * We may not have a scaler, eg. HSW does not have it any more > > + */ > > + if (!intel_plane->can_scale && (crtc_w != src_w || crtc_h != src_h)) > > + return -EINVAL; > > + > > + /* > > * We can take a larger source and scale it down, but > > * only so much... 16x is the max on SNB. > > */ > > @@ -666,6 +673,7 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe) > > switch (INTEL_INFO(dev)->gen) { > > case 5: > > case 6: > > + intel_plane->can_scale = true; > > intel_plane->max_downscale = 16; > > intel_plane->update_plane = ilk_update_plane; > > intel_plane->disable_plane = ilk_disable_plane; > > @@ -682,6 +690,10 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe) > > break; > > > > case 7: > > + if (IS_HASWELL(dev)) > > + intel_plane->can_scale = false; > > + else > > + intel_plane->can_scale = true; > > intel_plane->max_downscale = 2; > > intel_plane->update_plane = ivb_update_plane; > > intel_plane->disable_plane = ivb_disable_plane; > > Yeah, looks fine. Queued for -next, thanks for the patch. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch