diff options
author | Wentao Xu <wentaox@codeaurora.org> | 2015-06-22 11:53:42 -0400 |
---|---|---|
committer | Rob Clark <robdclark@gmail.com> | 2015-07-29 16:38:24 -0400 |
commit | 99fc1bc48f352185f1711795f0829bbf503c0712 (patch) | |
tree | 02ed43f3ef3496397c7a682792bf1b23e257f6dd /drivers/gpu/drm/msm/msm_gem.c | |
parent | a1c3e3e01ee301de6a13e696ef8775f40ca339ac (diff) | |
download | op-kernel-dev-99fc1bc48f352185f1711795f0829bbf503c0712.zip op-kernel-dev-99fc1bc48f352185f1711795f0829bbf503c0712.tar.gz |
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 f211b80..c76cc85 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 */ |