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

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

drm/i915: Pass the actual sprite width to watermarks functions 



Don't subtract one from the sprite width before watermark calculations.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent bdd57d03

drivers/gpu/drm/i915/intel_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -2641,7 +2641,7 @@ static void haswell_update_sprite_wm(struct drm_device *dev, int pipe, 
		if (intel_plane->pipe == pipe) {

			intel_plane->wm.enabled = enabled;

			intel_plane->wm.scaled = scaled;

			intel_plane->wm.horiz_pixels = sprite_width + 1;

			intel_plane->wm.horiz_pixels = sprite_width;

			intel_plane->wm.bytes_per_pixel = pixel_size;

			break;

		}

drivers/gpu/drm/i915/intel_sprite.c

+9 −9
Original line number Diff line number Diff line
@@ -108,15 +108,15 @@ 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,

				       src_w != crtc_w || src_h != crtc_h);



	/* Sizes are 0 based */

	src_w--;

	src_h--;

	crtc_w--;

	crtc_h--;



	intel_update_sprite_watermarks(dev, pipe, crtc_w, pixel_size, true,

				       src_w != crtc_w || src_h != crtc_h);



	I915_WRITE(SPSTRIDE(pipe, plane), fb->pitches[0]);

	I915_WRITE(SPPOS(pipe, plane), (crtc_y << 16) | crtc_x);
@@ -263,15 +263,15 @@ 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,

				       src_w != crtc_w || src_h != crtc_h);



	/* Sizes are 0 based */

	src_w--;

	src_h--;

	crtc_w--;

	crtc_h--;



	intel_update_sprite_watermarks(dev, pipe, crtc_w, pixel_size, true,

				       src_w != crtc_w || src_h != crtc_h);



	/*

	 * IVB workaround: must disable low power watermarks for at least

	 * one frame before enabling scaling.  LP watermarks can be re-enabled
@@ -452,15 +452,15 @@ 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,

				       src_w != crtc_w || src_h != crtc_h);



	/* Sizes are 0 based */

	src_w--;

	src_h--;

	crtc_w--;

	crtc_h--;



	intel_update_sprite_watermarks(dev, pipe, crtc_w, pixel_size, true,

				       src_w != crtc_w || src_h != crtc_h);



	dvsscale = 0;

	if (IS_GEN5(dev) || crtc_w != src_w || crtc_h != src_h)

		dvsscale = DVS_SCALE_ENABLE | (src_w << 16) | src_h;