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

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

drm/i915: Avoid underruns when disabling sprites 



As the watermark registers aren't double bufferd, clearing the
watermarks immediately after writing the sprite registers can be
hazardous.

Until we have something better, add a wait for vblank between the
two steps to make sure the sprite no longer needs the watermark
levels before we clear them.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent efb31d15

drivers/gpu/drm/i915/intel_sprite.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -336,6 +336,12 @@ ivb_disable_plane(struct drm_plane *plane, struct drm_crtc *crtc) 
	I915_MODIFY_DISPBASE(SPRSURF(pipe), 0);

	I915_MODIFY_DISPBASE(SPRSURF(pipe), 0);

	POSTING_READ(SPRSURF(pipe));

	POSTING_READ(SPRSURF(pipe));





	/*

	 * Avoid underruns when disabling the sprite.

	 * FIXME remove once watermark updates are done properly.

	 */

	intel_wait_for_vblank(dev, pipe);



	intel_update_sprite_watermarks(plane, crtc, 0, 0, false, false);

	intel_update_sprite_watermarks(plane, crtc, 0, 0, false, false);

}

}
@@ -503,6 +509,12 @@ ilk_disable_plane(struct drm_plane *plane, struct drm_crtc *crtc) 
	I915_MODIFY_DISPBASE(DVSSURF(pipe), 0);

	I915_MODIFY_DISPBASE(DVSSURF(pipe), 0);

	POSTING_READ(DVSSURF(pipe));

	POSTING_READ(DVSSURF(pipe));





	/*

	 * Avoid underruns when disabling the sprite.

	 * FIXME remove once watermark updates are done properly.

	 */

	intel_wait_for_vblank(dev, pipe);



	intel_update_sprite_watermarks(plane, crtc, 0, 0, false, false);

	intel_update_sprite_watermarks(plane, crtc, 0, 0, false, false);

}

}