diff options
| author | Wentao Xu | 2015-06-22 17:53:42 +0200 |
|---|---|---|
| committer | Rob Clark | 2015-07-29 22:38:24 +0200 |
| commit | 99fc1bc48f352185f1711795f0829bbf503c0712 (patch) | |
| tree | 02ed43f3ef3496397c7a682792bf1b23e257f6dd /drivers/gpu/drm/msm/msm_atomic.c | |
| parent | drm/msm: mdp4: Fix drm_framebuffer dereference crash (diff) | |
| download | kernel-qcow2-linux-99fc1bc48f352185f1711795f0829bbf503c0712.tar.gz kernel-qcow2-linux-99fc1bc48f352185f1711795f0829bbf503c0712.tar.xz kernel-qcow2-linux-99fc1bc48f352185f1711795f0829bbf503c0712.zip | |
drm/msm: change to uninterruptible wait in atomic commit
The atomic commit cannot easily undo and return an error once the
state is swapped. Change to uninterruptible wait, and ignore the
timeout error.
Signed-off-by: Wentao Xu <wentaox@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_atomic.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_atomic.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c index 1b22d8bfe142..1ceb4f22dd89 100644 --- a/drivers/gpu/drm/msm/msm_atomic.c +++ b/drivers/gpu/drm/msm/msm_atomic.c @@ -283,12 +283,8 @@ int msm_atomic_commit(struct drm_device *dev, timeout = ktime_add_ms(ktime_get(), 1000); - ret = msm_wait_fence_interruptable(dev, c->fence, &timeout); - if (ret) { - WARN_ON(ret); // TODO unswap state back? or?? - commit_destroy(c); - return ret; - } + /* uninterruptible wait */ + msm_wait_fence(dev, c->fence, &timeout, false); complete_commit(c); |