1 From bc27882bfefac9a1596aaed387ac01a844765e6c Mon Sep 17 00:00:00 2001
2 From: Robert Foss <robert.foss@collabora.com>
3 Date: Tue, 3 May 2016 13:48:20 -0400
4 Subject: [PATCH] drm/vc4: Return -EBUSY if there's already a pending flip
7 As per the documentation in drm_crtc.h, atomic_commit should return
8 -EBUSY if an asynchronous update is requested and there is an earlier
11 v2: Rebase on the s/async/nonblock/ change.
13 Signed-off-by: Robert Foss <robert.foss@collabora.com>
14 Reviewed-by: Eric Anholt <eric@anholt.net>
15 (cherry picked from commit e7c31f6f25b84fed961dc0dce6248878527693ae)
17 drivers/gpu/drm/vc4/vc4_kms.c | 16 ++++++++++++----
18 1 file changed, 12 insertions(+), 4 deletions(-)
20 --- a/drivers/gpu/drm/vc4/vc4_kms.c
21 +++ b/drivers/gpu/drm/vc4/vc4_kms.c
22 @@ -119,10 +119,18 @@ static int vc4_atomic_commit(struct drm_
25 /* Make sure that any outstanding modesets have finished. */
26 - ret = down_interruptible(&vc4->async_modeset);
31 + ret = down_trylock(&vc4->async_modeset);
37 + ret = down_interruptible(&vc4->async_modeset);
44 ret = drm_atomic_helper_prepare_planes(dev, state);