Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec4c4aa1 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Calculate the sprite WM based on the source width instead of the destination width 



Using the destination width in the sprite WM calculations isn't correct.
We should be using the source width.

Note: This doesn't affect hsw since it does not support sprite
scaling.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: Add review note from Paulo to the commit message.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 67ca28f3

drivers/gpu/drm/i915/intel_sprite.c

+3 −3
Original line number Diff line number Diff line
@@ -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 */
@@ -452,7 +452,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 */