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

Commit 213f1bd0 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/i915: Skip vblank waits for cursor updates when watermarks dont need updating 



In legacy cursor updates we need the extra vblank waits if we update
watermarks, and then we cannot skip the vblank for cursors.

This is why for < gen9 we disabled the cursor fastpath, but we can skip
the wait when post vblank watermarks are untouched.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170919121419.13708-2-maarten.lankhorst@linux.intel.com
parent 3cf50c63

drivers/gpu/drm/i915/intel_display.c

+10 −2
Original line number Diff line number Diff line
@@ -12562,8 +12562,16 @@ static int intel_atomic_commit(struct drm_device *dev, 
	 * FIXME doing watermarks and fb cleanup from a vblank worker

	 * (assuming we had any) would solve these problems.

	 */

	if (INTEL_GEN(dev_priv) < 9)

	if (INTEL_GEN(dev_priv) < 9 && state->legacy_cursor_update) {

		struct intel_crtc_state *new_crtc_state;

		struct intel_crtc *crtc;

		int i;



		for_each_new_intel_crtc_in_state(intel_state, crtc, new_crtc_state, i)

			if (new_crtc_state->wm.need_postvbl_update ||

			    new_crtc_state->update_wm_post)

				state->legacy_cursor_update = false;

	}



	ret = intel_atomic_prepare_commit(dev, state);

	if (ret) {