diff options
Diffstat (limited to 'src/gallium/drivers/svga')
| -rw-r--r-- | src/gallium/drivers/svga/svga_pipe_query.c | 9 | ||||
| -rw-r--r-- | src/gallium/drivers/svga/svga_resource_texture.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/svga/svga_screen.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/svga/svga_winsys.h | 3 |
4 files changed, 12 insertions, 6 deletions
diff --git a/src/gallium/drivers/svga/svga_pipe_query.c b/src/gallium/drivers/svga/svga_pipe_query.c index 6703b729c6e..0490a4ab5fc 100644 --- a/src/gallium/drivers/svga/svga_pipe_query.c +++ b/src/gallium/drivers/svga/svga_pipe_query.c @@ -191,7 +191,8 @@ get_query_result_vgpu9(struct svga_context *svga, struct svga_query *sq, if (state == SVGA3D_QUERYSTATE_PENDING) { if (!wait) return FALSE; - sws->fence_finish(sws, sq->fence, SVGA_FENCE_FLAG_QUERY); + sws->fence_finish(sws, sq->fence, PIPE_TIMEOUT_INFINITE, + SVGA_FENCE_FLAG_QUERY); state = sq->queryResult->state; } @@ -651,7 +652,8 @@ get_query_result_vgpu10(struct svga_context *svga, struct svga_query *sq, queryState == SVGA3D_QUERYSTATE_NEW) { if (!wait) return FALSE; - sws->fence_finish(sws, sq->fence, SVGA_FENCE_FLAG_QUERY); + sws->fence_finish(sws, sq->fence, PIPE_TIMEOUT_INFINITE, + SVGA_FENCE_FLAG_QUERY); sws->query_get_result(sws, sq->gb_query, sq->offset, &queryState, result, resultLen); } @@ -1230,7 +1232,8 @@ svga_render_condition(struct pipe_context *pipe, struct pipe_query *q, if ((mode == PIPE_RENDER_COND_WAIT || mode == PIPE_RENDER_COND_BY_REGION_WAIT) && sq->fence) { - sws->fence_finish(sws, sq->fence, SVGA_FENCE_FLAG_QUERY); + sws->fence_finish(sws, sq->fence, PIPE_TIMEOUT_INFINITE, + SVGA_FENCE_FLAG_QUERY); } } /* diff --git a/src/gallium/drivers/svga/svga_resource_texture.c b/src/gallium/drivers/svga/svga_resource_texture.c index 5a684b7933b..5b82e9eb7b6 100644 --- a/src/gallium/drivers/svga/svga_resource_texture.c +++ b/src/gallium/drivers/svga/svga_resource_texture.c @@ -128,7 +128,7 @@ svga_transfer_dma(struct svga_context *svga, if (transfer == SVGA3D_READ_HOST_VRAM) { svga_context_flush(svga, &fence); - sws->fence_finish(sws, fence, 0); + sws->fence_finish(sws, fence, PIPE_TIMEOUT_INFINITE, 0); sws->fence_reference(sws, &fence, NULL); } } @@ -187,7 +187,7 @@ svga_transfer_dma(struct svga_context *svga, if (transfer == SVGA3D_READ_HOST_VRAM) { svga_context_flush(svga, &fence); - sws->fence_finish(sws, fence, 0); + sws->fence_finish(sws, fence, PIPE_TIMEOUT_INFINITE, 0); hw = sws->buffer_map(sws, st->hwbuf, PIPE_TRANSFER_READ); assert(hw); diff --git a/src/gallium/drivers/svga/svga_screen.c b/src/gallium/drivers/svga/svga_screen.c index f40d151af5d..1368267d962 100644 --- a/src/gallium/drivers/svga/svga_screen.c +++ b/src/gallium/drivers/svga/svga_screen.c @@ -854,7 +854,7 @@ svga_fence_finish(struct pipe_screen *screen, SVGA_DBG(DEBUG_DMA|DEBUG_PERF, "%s fence_ptr %p\n", __FUNCTION__, fence); - retVal = sws->fence_finish(sws, fence, 0) == 0; + retVal = sws->fence_finish(sws, fence, timeout, 0) == 0; } SVGA_STATS_TIME_POP(sws); diff --git a/src/gallium/drivers/svga/svga_winsys.h b/src/gallium/drivers/svga/svga_winsys.h index 7c2fb70a0af..c785b4f748a 100644 --- a/src/gallium/drivers/svga/svga_winsys.h +++ b/src/gallium/drivers/svga/svga_winsys.h @@ -625,11 +625,14 @@ struct svga_winsys_screen /** * Wait for the fence to finish. + * \param timeout in nanoseconds (may be PIPE_TIMEOUT_INFINITE). + * 0 to return immediately, if the API suports it. * \param flags driver-specific meaning * \return zero on success. */ int (*fence_finish)( struct svga_winsys_screen *sws, struct pipe_fence_handle *fence, + uint64_t timeout, unsigned flag ); |