diff options
| author | Wentao Xu | 2015-06-22 17:53:42 +0200 |
|---|---|---|
| committer | Rob Clark | 2015-08-14 23:10:14 +0200 |
| commit | a9702ca23edae7b72dcff266a0c5ae56f6af0fa5 (patch) | |
| tree | ae4d308050ba3e9c443c969bd6cc6f05b5ae8de0 /drivers/gpu/drm/msm/msm_drv.h | |
| parent | drm/msm: mdp4: Fix drm_framebuffer dereference crash (diff) | |
| download | kernel-qcow2-linux-a9702ca23edae7b72dcff266a0c5ae56f6af0fa5.tar.gz kernel-qcow2-linux-a9702ca23edae7b72dcff266a0c5ae56f6af0fa5.tar.xz kernel-qcow2-linux-a9702ca23edae7b72dcff266a0c5ae56f6af0fa5.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_drv.h')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_drv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index e7c5ea125d45..4ff0ec9c994b 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -164,8 +164,8 @@ int msm_atomic_commit(struct drm_device *dev, int msm_register_mmu(struct drm_device *dev, struct msm_mmu *mmu); -int msm_wait_fence_interruptable(struct drm_device *dev, uint32_t fence, - ktime_t *timeout); +int msm_wait_fence(struct drm_device *dev, uint32_t fence, + ktime_t *timeout, bool interruptible); int msm_queue_fence_cb(struct drm_device *dev, struct msm_fence_cb *cb, uint32_t fence); void msm_update_fence(struct drm_device *dev, uint32_t fence); |