Mesa (master): winsys/radeon: don't use the new GEM_WAIT ioctl for now

[Marek Olšák]

Module: Mesa
Branch: master
Commit: ef64da8f013691c66744064769db379e57ef95de
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ef64da8f013691c66744064769db379e57ef95de

Author: Marek Olšák <maraeo at gmail.com>
Date:   Mon Oct 24 19:44:49 2011 +0200

winsys/radeon: don't use the new GEM_WAIT ioctl for now

---

 src/gallium/winsys/radeon/drm/radeon_drm_bo.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
index 4bb433a..b8d7418 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
@@ -110,13 +110,14 @@ static void radeon_bo_wait(struct pb_buffer *_buf, enum radeon_bo_usage usage)
         sched_yield();
     }
 
-    if (bo->rws->info.drm_minor >= 12) {
+    /* XXX use this when it's ready */
+    /*if (bo->rws->info.drm_minor >= 12) {
         struct drm_radeon_gem_wait args = {};
         args.handle = bo->handle;
         args.flags = usage;
         while (drmCommandWriteRead(bo->rws->fd, DRM_RADEON_GEM_WAIT,
                                    &args, sizeof(args)) == -EBUSY);
-    } else {
+    } else*/ {
         struct drm_radeon_gem_wait_idle args = {};
         args.handle = bo->handle;
         while (drmCommandWriteRead(bo->rws->fd, DRM_RADEON_GEM_WAIT_IDLE,
@@ -133,13 +134,14 @@ static boolean radeon_bo_is_busy(struct pb_buffer *_buf,
         return TRUE;
     }
 
-    if (bo->rws->info.drm_minor >= 12) {
+    /* XXX use this when it's ready */
+    /*if (bo->rws->info.drm_minor >= 12) {
         struct drm_radeon_gem_wait args = {};
         args.handle = bo->handle;
         args.flags = usage | RADEON_GEM_NO_WAIT;
         return drmCommandWriteRead(bo->rws->fd, DRM_RADEON_GEM_WAIT,
                                    &args, sizeof(args)) != 0;
-    } else {
+    } else*/ {
         struct drm_radeon_gem_busy args = {};
         args.handle = bo->handle;
         return drmCommandWriteRead(bo->rws->fd, DRM_RADEON_GEM_BUSY,