Commit 723c3e55 authored by Daniel Vetter's avatar Daniel Vetter

drm/atomic-helpers: Stall on the right commit

stall_checks carefully picked out the right commit to stall on, then
promptly used the wrong variable. Due to the break in the next loop
iteration this could be the 3rd commit, or if the list only has 2
entries commit would now point into the struct drm_crtc itself, at
some offset. Hilarity eventually ensues.

For added safety, also break right away instead of iterating once
more, but the real fix is waiting on stall_commit instead of commit.
Reported-and-tested-by: default avatarLiviu Dudau <Liviu.Dudau@arm.com>
Cc: Liviu Dudau <Liviu.Dudau@arm.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Reviewed-by: default avatarLiviu Dudau <Liviu.Dudau@arm.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1465926658-10110-1-git-send-email-daniel.vetter@ffwll.ch
parent 0e7c875d
...@@ -1324,8 +1324,8 @@ static int stall_checks(struct drm_crtc *crtc, bool nonblock) ...@@ -1324,8 +1324,8 @@ static int stall_checks(struct drm_crtc *crtc, bool nonblock)
} else if (i == 1) { } else if (i == 1) {
stall_commit = commit; stall_commit = commit;
drm_crtc_commit_get(stall_commit); drm_crtc_commit_get(stall_commit);
} else
break; break;
}
i++; i++;
} }
...@@ -1337,7 +1337,7 @@ static int stall_checks(struct drm_crtc *crtc, bool nonblock) ...@@ -1337,7 +1337,7 @@ static int stall_checks(struct drm_crtc *crtc, bool nonblock)
/* We don't want to let commits get ahead of cleanup work too much, /* We don't want to let commits get ahead of cleanup work too much,
* stalling on 2nd previous commit means triple-buffer won't ever stall. * stalling on 2nd previous commit means triple-buffer won't ever stall.
*/ */
ret = wait_for_completion_interruptible_timeout(&commit->cleanup_done, ret = wait_for_completion_interruptible_timeout(&stall_commit->cleanup_done,
10*HZ); 10*HZ);
if (ret == 0) if (ret == 0)
DRM_ERROR("[CRTC:%d:%s] cleanup_done timed out\n", DRM_ERROR("[CRTC:%d:%s] cleanup_done timed out\n",
......
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