Commit fcc86cb4 authored Nov 15, 2018 by Boris Brezillon

drm/vc4: Set ->legacy_cursor_update to false when doing non-async updates



drm_atomic_helper_setup_commit() auto-completes commit->flip_done when
state->legacy_cursor_update is true, but we know for sure that we want
a sync update when we call drm_atomic_helper_setup_commit() from
vc4_atomic_commit().

Explicitly set state->legacy_cursor_update to false to prevent this
auto-completion.

Fixes: 184d3cf4 ("drm/vc4: Use wait_for_flip_done() instead of wait_for_vblanks()")
Cc: <stable@vger.kernel.org>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20181115105852.9844-2-boris.brezillon@bootlin.com

parent 5a43911f

drivers/gpu/drm/vc4/vc4_kms.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -214,6 +214,12 @@ static int vc4_atomic_commit(struct drm_device *dev,
		return 0;
		}

		/* We know for sure we don't want an async update here. Set
		* state->legacy_cursor_update to false to prevent
		* drm_atomic_helper_setup_commit() from auto-completing
		* commit->flip_done.
		*/
		state->legacy_cursor_update = false;
		ret = drm_atomic_helper_setup_commit(state, nonblock);
		if (ret)
		return ret;

Admin message