2013/7/5 <ville.syrjala@xxxxxxxxxxxxxxx>: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > Using the destination width in the sprite WM calculations isn't correct. > We should be using the source width. > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Seems correct according to the IVB WM calculator. It is also worth mentioning that this doesn't affect HSW watermarks since HSW doesn't support sprite scaling. Reviewed-by: Paulo Zanoni <paulo.r.zanoni@xxxxxxxxx> > --- > drivers/gpu/drm/i915/intel_sprite.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c > index d7fca56..7c6cce7 100644 > --- a/drivers/gpu/drm/i915/intel_sprite.c > +++ b/drivers/gpu/drm/i915/intel_sprite.c > @@ -108,7 +108,7 @@ vlv_update_plane(struct drm_plane *dplane, struct drm_framebuffer *fb, > > sprctl |= SP_ENABLE; > > - intel_update_sprite_watermarks(dev, pipe, crtc_w, pixel_size, true, > + intel_update_sprite_watermarks(dev, pipe, src_w, pixel_size, true, > src_w != crtc_w || src_h != crtc_h); > > /* Sizes are 0 based */ > @@ -263,7 +263,7 @@ ivb_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb, > if (IS_HASWELL(dev)) > sprctl |= SPRITE_PIPE_CSC_ENABLE; > > - intel_update_sprite_watermarks(dev, pipe, crtc_w, pixel_size, true, > + intel_update_sprite_watermarks(dev, pipe, src_w, pixel_size, true, > src_w != crtc_w || src_h != crtc_h); > > /* Sizes are 0 based */ > @@ -451,7 +451,7 @@ ilk_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb, > dvscntr |= DVS_TRICKLE_FEED_DISABLE; /* must disable */ > dvscntr |= DVS_ENABLE; > > - intel_update_sprite_watermarks(dev, pipe, crtc_w, pixel_size, true, > + intel_update_sprite_watermarks(dev, pipe, src_w, pixel_size, true, > src_w != crtc_w || src_h != crtc_h); > > /* Sizes are 0 based */ > -- > 1.8.1.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Paulo Zanoni _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
