openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/atomic: Allow drm_atomic_helper_swap_state to fail 

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170711143314.2148-13-maarten.lankhorst@linux.intel.com
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Maarten Lankhorst 2017-07-11 16:33:14 +02:00 committed by Daniel Vetter
parent 8a39374ef8
commit c4bbb73584
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/gpu/drm/drm_atomic_helper.c
View File

@ -2261,13 +2261,13 @@ EXPORT_SYMBOL(drm_atomic_helper_cleanup_planes);
* *
* Returns: * Returns:
* *
* Always returns 0, cannot fail yet. * Returns 0 on success. Can return -ERESTARTSYS when @stall is true and the
* waiting for the previous commits has been interrupted.
*/ */
int drm_atomic_helper_swap_state(struct drm_atomic_state *state, int drm_atomic_helper_swap_state(struct drm_atomic_state *state,
bool stall) bool stall)
{ {
int i; int i, ret;
long ret;
struct drm_connector *connector; struct drm_connector *connector;
struct drm_connector_state *old_conn_state, *new_conn_state; struct drm_connector_state *old_conn_state, *new_conn_state;
struct drm_crtc *crtc; struct drm_crtc *crtc;
@ -2290,12 +2290,11 @@ int drm_atomic_helper_swap_state(struct drm_atomic_state *state,
if (!commit) if (!commit)
continue; continue;
ret = wait_for_completion_timeout(&commit->hw_done, ret = wait_for_completion_interruptible(&commit->hw_done);
10*HZ);
if (ret == 0)
DRM_ERROR("[CRTC:%d:%s] hw_done timed out\n",
crtc->base.id, crtc->name);
drm_crtc_commit_put(commit); drm_crtc_commit_put(commit);
if (ret)
return ret;
} }
} }