From: Daniel Vetter Subject: Re: [PATCH v2 01/17] drm/i915: Add scaled paramater to update_sprite_watermarks() Date: Mon, 5 Aug 2013 18:23:47 +0200 Message-ID: <20130805162347.GM22035@phenom.ffwll.local> References: <1375363135-20618-1-git-send-email-ville.syrjala@linux.intel.com> <1375363135-20618-2-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by gabe.freedesktop.org (Postfix) with ESMTP id 489B4E6B2C for ; Mon, 5 Aug 2013 09:23:41 -0700 (PDT) Received: by mail-wi0-f181.google.com with SMTP id en1so1734364wid.14 for ; Mon, 05 Aug 2013 09:23:40 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1375363135-20618-2-git-send-email-ville.syrjala@linux.intel.com> 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: ville.syrjala@linux.intel.com Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Thu, Aug 01, 2013 at 04:18:39PM +0300, ville.syrjala@linux.intel.com wro= te: > From: Ville Syrj=E4l=E4 > = > For calculating watermarks we want to know whether sprites are > scaled. Pass that information to update_sprite_watermarks() so that > eventually we may do some watermark pre-computing. > = > v2: Use "enabled" consistently, fix commit msg > = > Reviewed-by: Paulo Zanoni > Signed-off-by: Ville Syrj=E4l=E4 Oops, already merged v1. Please extract the fixup again and resubmit ;-) -Daniel > --- > drivers/gpu/drm/i915/i915_drv.h | 2 +- > drivers/gpu/drm/i915/intel_drv.h | 7 ++++--- > drivers/gpu/drm/i915/intel_pm.c | 15 ++++++++------- > drivers/gpu/drm/i915/intel_sprite.c | 11 +++++++---- > 4 files changed, 20 insertions(+), 15 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_= drv.h > index 82ea281..fe466bc 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -361,7 +361,7 @@ struct drm_i915_display_funcs { > void (*update_wm)(struct drm_device *dev); > void (*update_sprite_wm)(struct drm_device *dev, int pipe, > uint32_t sprite_width, int pixel_size, > - bool enable); > + bool enabled, bool scaled); > void (*modeset_global_resources)(struct drm_device *dev); > /* Returns the active state of the crtc, and if the crtc is active, > * fills out the pipe-config with the hw state. */ > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/inte= l_drv.h > index 474797b..ed33976 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -349,7 +349,8 @@ struct intel_plane { > * for the watermark calculations. Currently only Haswell uses this. > */ > struct { > - bool enable; > + bool enabled; > + bool scaled; > uint8_t bytes_per_pixel; > uint32_t horiz_pixels; > } wm; > @@ -770,8 +771,8 @@ extern void intel_ddi_init(struct drm_device *dev, en= um port port); > /* For use by IVB LP watermark workaround in intel_sprite.c */ > extern void intel_update_watermarks(struct drm_device *dev); > extern void intel_update_sprite_watermarks(struct drm_device *dev, int p= ipe, > - uint32_t sprite_width, > - int pixel_size, bool enable); > + uint32_t sprite_width, int pixel_size, > + bool enabled, bool scaled); > = > extern unsigned long intel_gen4_compute_page_offset(int *x, int *y, > unsigned int tiling_mode, > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel= _pm.c > index 0a5ba92..5a008d1 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -2388,7 +2388,7 @@ static void hsw_compute_wm_parameters(struct drm_de= vice *dev, > pipe =3D intel_plane->pipe; > p =3D ¶ms[pipe]; > = > - p->sprite_enabled =3D intel_plane->wm.enable; > + p->sprite_enabled =3D intel_plane->wm.enabled; > p->spr_bytes_per_pixel =3D intel_plane->wm.bytes_per_pixel; > p->spr_horiz_pixels =3D intel_plane->wm.horiz_pixels; > = > @@ -2616,7 +2616,7 @@ static void haswell_update_wm(struct drm_device *de= v) > = > static void haswell_update_sprite_wm(struct drm_device *dev, int pipe, > uint32_t sprite_width, int pixel_size, > - bool enable) > + bool enabled, bool scaled) > { > struct drm_plane *plane; > = > @@ -2624,7 +2624,8 @@ static void haswell_update_sprite_wm(struct drm_dev= ice *dev, int pipe, > struct intel_plane *intel_plane =3D to_intel_plane(plane); > = > if (intel_plane->pipe =3D=3D pipe) { > - intel_plane->wm.enable =3D enable; > + intel_plane->wm.enabled =3D enabled; > + intel_plane->wm.scaled =3D scaled; > intel_plane->wm.horiz_pixels =3D sprite_width + 1; > intel_plane->wm.bytes_per_pixel =3D pixel_size; > break; > @@ -2712,7 +2713,7 @@ sandybridge_compute_sprite_srwm(struct drm_device *= dev, int plane, > = > static void sandybridge_update_sprite_wm(struct drm_device *dev, int pip= e, > uint32_t sprite_width, int pixel_size, > - bool enable) > + bool enabled, bool scaled) > { > struct drm_i915_private *dev_priv =3D dev->dev_private; > int latency =3D SNB_READ_WM0_LATENCY() * 100; /* In unit 0.1us */ > @@ -2720,7 +2721,7 @@ static void sandybridge_update_sprite_wm(struct drm= _device *dev, int pipe, > int sprite_wm, reg; > int ret; > = > - if (!enable) > + if (!enabled) > return; > = > switch (pipe) { > @@ -2835,13 +2836,13 @@ void intel_update_watermarks(struct drm_device *d= ev) > = > void intel_update_sprite_watermarks(struct drm_device *dev, int pipe, > uint32_t sprite_width, int pixel_size, > - bool enable) > + bool enabled, bool scaled) > { > struct drm_i915_private *dev_priv =3D dev->dev_private; > = > if (dev_priv->display.update_sprite_wm) > dev_priv->display.update_sprite_wm(dev, pipe, sprite_width, > - pixel_size, enable); > + pixel_size, enabled, scaled); > } > = > static struct drm_i915_gem_object * > diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/i= ntel_sprite.c > index 55bdf70..069155f 100644 > --- a/drivers/gpu/drm/i915/intel_sprite.c > +++ b/drivers/gpu/drm/i915/intel_sprite.c > @@ -114,7 +114,8 @@ vlv_update_plane(struct drm_plane *dplane, struct drm= _framebuffer *fb, > crtc_w--; > crtc_h--; > = > - intel_update_sprite_watermarks(dev, pipe, crtc_w, pixel_size, true); > + intel_update_sprite_watermarks(dev, pipe, crtc_w, pixel_size, true, > + src_w !=3D crtc_w || src_h !=3D crtc_h); > = > I915_WRITE(SPSTRIDE(pipe, plane), fb->pitches[0]); > I915_WRITE(SPPOS(pipe, plane), (crtc_y << 16) | crtc_x); > @@ -268,7 +269,8 @@ ivb_update_plane(struct drm_plane *plane, struct drm_= framebuffer *fb, > crtc_w--; > crtc_h--; > = > - intel_update_sprite_watermarks(dev, pipe, crtc_w, pixel_size, true); > + intel_update_sprite_watermarks(dev, pipe, crtc_w, pixel_size, true, > + src_w !=3D crtc_w || src_h !=3D crtc_h); > = > /* > * IVB workaround: must disable low power watermarks for at least > @@ -336,7 +338,7 @@ ivb_disable_plane(struct drm_plane *plane) > = > dev_priv->sprite_scaling_enabled &=3D ~(1 << pipe); > = > - intel_update_sprite_watermarks(dev, pipe, 0, 0, false); > + intel_update_sprite_watermarks(dev, pipe, 0, 0, false, false); > = > /* potentially re-enable LP watermarks */ > if (scaling_was_enabled && !dev_priv->sprite_scaling_enabled) > @@ -456,7 +458,8 @@ ilk_update_plane(struct drm_plane *plane, struct drm_= framebuffer *fb, > crtc_w--; > crtc_h--; > = > - intel_update_sprite_watermarks(dev, pipe, crtc_w, pixel_size, true); > + intel_update_sprite_watermarks(dev, pipe, crtc_w, pixel_size, true, > + src_w !=3D crtc_w || src_h !=3D crtc_h); > = > dvsscale =3D 0; > if (IS_GEN5(dev) || crtc_w !=3D src_w || crtc_h !=3D src_h) > -- = > 1.8.1.5 > = > _______________________________________________ > 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