diff options
| author | Thomas Hellstrom <[email protected]> | 2011-09-28 09:13:50 +0200 |
|---|---|---|
| committer | Thomas Hellstrom <[email protected]> | 2011-09-29 20:24:57 +0200 |
| commit | e7843273fae516fa9922f12053bb6c063b39921c (patch) | |
| tree | b535bde925b4269670dfa7f69f99110247428ea2 /src/gallium/winsys/svga/drm/vmw_context.c | |
| parent | e63f2787b6a8dd7ff7a093fea8017a0b74cac6fd (diff) | |
winsys/svga: Update to vmwgfx kernel module 2.1
Introduces fence objecs and a size limit on query buffers.
The possibility to map the fifo from user-space is gone, and
replaced by an ioctl that reads the 3D capabilities.
Signed-off-by: Thomas Hellstrom <[email protected]>
Reviewed-by: Jakob Bornecranz <[email protected]>
Diffstat (limited to 'src/gallium/winsys/svga/drm/vmw_context.c')
| -rw-r--r-- | src/gallium/winsys/svga/drm/vmw_context.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/gallium/winsys/svga/drm/vmw_context.c b/src/gallium/winsys/svga/drm/vmw_context.c index 633ef385a69..666e198954b 100644 --- a/src/gallium/winsys/svga/drm/vmw_context.c +++ b/src/gallium/winsys/svga/drm/vmw_context.c @@ -89,8 +89,6 @@ struct vmw_svga_winsys_context struct pb_validate *validate; - uint32_t last_fence; - /** * The amount of GMR that is referred by the commands currently batched * in the context. @@ -166,9 +164,7 @@ vmw_swc_flush(struct svga_winsys_context *swc, throttle_us, vswc->command.buffer, vswc->command.used, - &vswc->last_fence); - - fence = vmw_pipe_fence(vswc->last_fence); + &fence); pb_validate_fence(vswc->validate, fence); } @@ -200,7 +196,9 @@ vmw_swc_flush(struct svga_winsys_context *swc, vswc->seen_regions = 0; if(pfence) - *pfence = fence; + vmw_fence_reference(vswc->vws, pfence, fence); + + vmw_fence_reference(vswc->vws, &fence, NULL); return ret; } |