summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2011-10-24 19:44:49 +0200
committerMarek Olšák <maraeo@gmail.com>2011-10-24 20:01:14 +0200
commitef64da8f013691c66744064769db379e57ef95de (patch)
treee5eadfee6a4149290eb755f7ac9f8a7d9cbfa456 /src
parentcbb2b4149ba26ee26f73f53e9b2aa960d9e5862c (diff)
downloadexternal_mesa3d-ef64da8f013691c66744064769db379e57ef95de.zip
external_mesa3d-ef64da8f013691c66744064769db379e57ef95de.tar.gz
external_mesa3d-ef64da8f013691c66744064769db379e57ef95de.tar.bz2
winsys/radeon: don't use the new GEM_WAIT ioctl for now
Diffstat (limited to 'src')
-rw-r--r--src/gallium/winsys/radeon/drm/radeon_drm_bo.c10
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,