diff options
| author | Rob Clark | 2013-09-11 23:34:07 +0200 |
|---|---|---|
| committer | Rob Clark | 2013-09-11 23:36:28 +0200 |
| commit | f816f272437f3a2be0c9254d4ab8f917950d86a0 (patch) | |
| tree | 60a194cabed7ef5f367865d62daa99a62f5f6cf4 /drivers/gpu/drm/msm/msm_drv.h | |
| parent | drm/msm: fix return value check in ERR_PTR() (diff) | |
| download | kernel-qcow2-linux-f816f272437f3a2be0c9254d4ab8f917950d86a0.tar.gz kernel-qcow2-linux-f816f272437f3a2be0c9254d4ab8f917950d86a0.tar.xz kernel-qcow2-linux-f816f272437f3a2be0c9254d4ab8f917950d86a0.zip | |
drm/msm: return -EBUSY if bo still active
When we CPU_PREP a bo with NOSYNC flag (for example, to implement
PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE), an -EBUSY return indicates to
userspace that the bo is still busy. Previously it was incorrectly
returning 0 in this case.
And while we're in there throw in an bit of extra sanity checking in
case userspace tries to wait for a bogus fence.
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 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index 1ea9d46e01bc..df8f1d084bc1 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -191,6 +191,12 @@ u32 msm_readl(const void __iomem *addr); #define DBG(fmt, ...) DRM_DEBUG(fmt"\n", ##__VA_ARGS__) #define VERB(fmt, ...) if (0) DRM_DEBUG(fmt"\n", ##__VA_ARGS__) +static inline bool fence_completed(struct drm_device *dev, uint32_t fence) +{ + struct msm_drm_private *priv = dev->dev_private; + return priv->completed_fence >= fence; +} + static inline int align_pitch(int width, int bpp) { int bytespp = (bpp + 7) / 8; |