diff options
author | Jerome Glisse <glisse@freedesktop.org> | 2008-03-10 23:36:27 +0100 |
---|---|---|
committer | John Doe <glisse@freedesktop.org> | 2008-03-10 23:36:27 +0100 |
commit | a7e6ca62ad0d9c3c45fd9e1d81b59c2db2d714cf (patch) | |
tree | 8f757eeaa2c234af14ca1df515de7810e770ed91 /libdrm/xf86drm.c | |
parent | a7dc4d08b9b4f8fe6fcaa4c778f6dd3718d1e36a (diff) | |
parent | 9f19e79f955281b9de393219e4ad9835ffe29c49 (diff) |
Merge branch 'modesetting-101' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Diffstat (limited to 'libdrm/xf86drm.c')
-rw-r--r-- | libdrm/xf86drm.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c index 13e99555..bcf562d5 100644 --- a/libdrm/xf86drm.c +++ b/libdrm/xf86drm.c @@ -2806,23 +2806,18 @@ int drmBOWaitIdle(int fd, drmBO *buf, unsigned hint) } return 0; } - + int drmBOBusy(int fd, drmBO *buf, int *busy) { - if (!(buf->flags & DRM_BO_FLAG_SHAREABLE) && - !(buf->replyFlags & DRM_BO_REP_BUSY)) { - *busy = 0; - return 0; - } - else { - int ret = drmBOInfo(fd, buf); - if (ret) - return ret; - *busy = (buf->replyFlags & DRM_BO_REP_BUSY); - return 0; - } + int ret = drmBOInfo(fd, buf); + + if (ret) + return ret; + + *busy = (buf->replyFlags & DRM_BO_REP_BUSY); + return 0; } - + int drmMMInit(int fd, unsigned long pOffset, unsigned long pSize, unsigned memType) { |