Mesa (master): v3dv: use PIPE_TIMEOUT_INFINITE

[GitLab Mirror]

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

Author: Iago Toral Quiroga <itoral at igalia.com>
Date:   Tue Jan 19 08:24:04 2021 +0100

v3dv: use PIPE_TIMEOUT_INFINITE

Reviewed-by: Alejandro Piñeiro <apinheiro at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8554>

---

 src/broadcom/vulkan/v3dv_bo.c         | 3 +--
 src/broadcom/vulkan/v3dv_cmd_buffer.c | 3 +--
 src/broadcom/vulkan/v3dv_queue.c      | 6 ++----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/broadcom/vulkan/v3dv_bo.c b/src/broadcom/vulkan/v3dv_bo.c
index 87e495d0f48..459032990b2 100644
--- a/src/broadcom/vulkan/v3dv_bo.c
+++ b/src/broadcom/vulkan/v3dv_bo.c
@@ -319,8 +319,7 @@ v3dv_bo_map(struct v3dv_device *device, struct v3dv_bo *bo, uint32_t size)
    if (!ok)
       return false;
 
-   const uint64_t infinite = 0xffffffffffffffffull;
-   ok = v3dv_bo_wait(device, bo, infinite);
+   ok = v3dv_bo_wait(device, bo, PIPE_TIMEOUT_INFINITE);
    if (!ok) {
       fprintf(stderr, "memory wait for map failed\n");
       return false;
diff --git a/src/broadcom/vulkan/v3dv_cmd_buffer.c b/src/broadcom/vulkan/v3dv_cmd_buffer.c
index 032da2adb4b..8b5c12a90d4 100644
--- a/src/broadcom/vulkan/v3dv_cmd_buffer.c
+++ b/src/broadcom/vulkan/v3dv_cmd_buffer.c
@@ -4949,8 +4949,7 @@ v3dv_cmd_buffer_rewrite_indirect_csd_job(
       /* Make sure the GPU is not currently accessing the indirect CL for this
        * job, since we are about to overwrite some of the uniform data.
        */
-      const uint64_t infinite = 0xffffffffffffffffull;
-      v3dv_bo_wait(job->device, job->indirect.bo, infinite);
+      v3dv_bo_wait(job->device, job->indirect.bo, PIPE_TIMEOUT_INFINITE);
 
       for (uint32_t i = 0; i < 3; i++) {
          if (info->wg_uniform_offsets[i]) {
diff --git a/src/broadcom/vulkan/v3dv_queue.c b/src/broadcom/vulkan/v3dv_queue.c
index fd54a24cdb0..6ea6d1acff8 100644
--- a/src/broadcom/vulkan/v3dv_queue.c
+++ b/src/broadcom/vulkan/v3dv_queue.c
@@ -169,8 +169,7 @@ handle_reset_query_cpu_job(struct v3dv_job *job)
       query->maybe_available = false;
       switch (info->pool->query_type) {
       case VK_QUERY_TYPE_OCCLUSION: {
-         const uint64_t infinite = 0xffffffffffffffffull;
-         v3dv_bo_wait(job->device, query->bo, infinite);
+         v3dv_bo_wait(job->device, query->bo, PIPE_TIMEOUT_INFINITE);
          uint32_t *counter = (uint32_t *) query->bo->map;
          *counter = 0;
          break;
@@ -466,8 +465,7 @@ handle_csd_indirect_cpu_job(struct v3dv_queue *queue,
 
    /* Make sure the GPU is no longer using the indirect buffer*/
    assert(info->buffer && info->buffer->mem && info->buffer->mem->bo);
-   const uint64_t infinite = 0xffffffffffffffffull;
-   v3dv_bo_wait(queue->device, info->buffer->mem->bo, infinite);
+   v3dv_bo_wait(queue->device, info->buffer->mem->bo, PIPE_TIMEOUT_INFINITE);
 
    /* Map the indirect buffer and read the dispatch parameters */
    assert(info->buffer && info->buffer->mem && info->buffer->mem->bo);