fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 05:08:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

anv: Simplify submit_simple_batch()

Browse source 
BO waits aren't going away any time soon so using a syncobj here doesn't
really gain us anything.  It just makes it more complicated.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13427>
This commit is contained in:
Jason Ekstrand 2021-11-10 09:33:57 -06:00
parent 623e9ecd6d
commit 36b4d12f02
1 changed files with 5 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/intel/vulkan/anv_batch_chain.c
View file

@ -2308,48 +2308,21 @@ anv_queue_submit_simple_batch(struct anv_queue *queue,
.rsvd2 = 0,
};
struct drm_i915_gem_exec_fence fence = {};
if (device->physical->has_syncobj_wait) {
err = drmSyncobjCreate(device->fd, 0, &fence.handle);
if (err != 0) {
result = vk_errorf(queue, VK_ERROR_OUT_OF_DEVICE_MEMORY,
"drmSyncobjCreate failed: %m");
goto fail;
}
fence.flags = I915_EXEC_FENCE_SIGNAL;
execbuf.execbuf.flags |= I915_EXEC_FENCE_ARRAY;
execbuf.execbuf.num_cliprects = 1;
execbuf.execbuf.cliprects_ptr = (uintptr_t)&fence;
}
err = anv_gem_execbuffer(device, &execbuf.execbuf);
if (err) {
result = vk_device_set_lost(&device->vk, "anv_gem_execbuffer failed: %m");
goto fail;
}
if (fence.handle) {
err = drmSyncobjWait(device->fd, &fence.handle, 1, INT64_MAX, 0, NULL);
if (err) {
result = vk_device_set_lost(&device->vk,
"drmSyncobjWait failed: %m");
goto fail;
}
} else {
result = anv_device_wait(device, batch_bo, INT64_MAX);
if (result != VK_SUCCESS) {
result = vk_device_set_lost(&device->vk,
"anv_device_wait failed: %m");
goto fail;
}
result = anv_device_wait(device, batch_bo, INT64_MAX);
if (result != VK_SUCCESS) {
result = vk_device_set_lost(&device->vk,
"anv_device_wait failed: %m");
goto fail;
}
fail:
anv_execbuf_finish(&execbuf);
if (fence.handle)
drmSyncobjDestroy(device->fd, fence.handle);
anv_bo_pool_free(&device->batch_bo_pool, batch_bo);
return result;