summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r300/r300_screen.c
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2011-08-07 19:04:37 +0200
committerMarek Olšák <maraeo@gmail.com>2011-08-16 09:15:11 +0200
commit1e3c81a068c4ae04cd1c6b18c687d5be69b7b8c4 (patch)
treecad1609cdb29df34a333e62d91fa76aac54b5b84 /src/gallium/drivers/r300/r300_screen.c
parent296b8990956fcbd7ce47902d7c108a5973db9397 (diff)
downloadexternal_mesa3d-1e3c81a068c4ae04cd1c6b18c687d5be69b7b8c4.zip
external_mesa3d-1e3c81a068c4ae04cd1c6b18c687d5be69b7b8c4.tar.gz
external_mesa3d-1e3c81a068c4ae04cd1c6b18c687d5be69b7b8c4.tar.bz2
winsys/radeon: hook up the new DRM_RADEON_GEM_WAIT ioctl
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'src/gallium/drivers/r300/r300_screen.c')
-rw-r--r--src/gallium/drivers/r300/r300_screen.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c
index 674bd24..13d25ba 100644
--- a/src/gallium/drivers/r300/r300_screen.c
+++ b/src/gallium/drivers/r300/r300_screen.c
@@ -454,7 +454,7 @@ static boolean r300_fence_signalled(struct pipe_screen *screen,
struct radeon_winsys *rws = r300_screen(screen)->rws;
struct pb_buffer *rfence = (struct pb_buffer*)fence;
- return !rws->buffer_is_busy(rfence);
+ return !rws->buffer_is_busy(rfence, RADEON_USAGE_READWRITE);
}
static boolean r300_fence_finish(struct pipe_screen *screen,
@@ -471,7 +471,7 @@ static boolean r300_fence_finish(struct pipe_screen *screen,
timeout /= 1000;
/* Wait in a loop. */
- while (rws->buffer_is_busy(rfence)) {
+ while (rws->buffer_is_busy(rfence, RADEON_USAGE_READWRITE)) {
if (os_time_get() - start_time >= timeout) {
return FALSE;
}
@@ -480,7 +480,7 @@ static boolean r300_fence_finish(struct pipe_screen *screen,
return TRUE;
}
- rws->buffer_wait(rfence);
+ rws->buffer_wait(rfence, RADEON_USAGE_READWRITE);
return TRUE;
}