Commit d68bc0e7 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter

drm/vc4: Handle drm_atomic_helper_swap_state failure

drm_atomic_helper_swap_state() will be changed to interruptible waiting
in the next few commits, so all drivers have to be changed to handling
failure.

VC4 has its own nonblocking modeset tracking through the vc4->async_modeset
semaphore, so it doesn't need to stall in swap_state. Pass stall = false
and BUG_ON when it returns an error. This should never happen for !stall.
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Eric Anholt <eric@anholt.net>
Link: http://patchwork.freedesktop.org/patch/msgid/20170711143314.2148-11-maarten.lankhorst@linux.intel.comReviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent fad9e43a
...@@ -126,7 +126,7 @@ static int vc4_atomic_commit(struct drm_device *dev, ...@@ -126,7 +126,7 @@ static int vc4_atomic_commit(struct drm_device *dev,
* the software side now. * the software side now.
*/ */
drm_atomic_helper_swap_state(state, true); BUG_ON(drm_atomic_helper_swap_state(state, false) < 0);
/* /*
* Everything below can be run asynchronously without the need to grab * Everything below can be run asynchronously without the need to grab
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment