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_gem.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_gem.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index f211b80e3a1e..c76cc853b08a 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -460,7 +460,7 @@ int msm_gem_cpu_prep(struct drm_gem_object *obj, uint32_t op, ktime_t *timeout) if (op & MSM_PREP_NOSYNC) timeout = NULL; - ret = msm_wait_fence_interruptable(dev, fence, timeout); + ret = msm_wait_fence(dev, fence, timeout, true); } /* TODO cache maintenance */ |