fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-21 21:40:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

v3dv: enable multiple semaphores for tfu job

Browse source 
Whenever v3d kernel-driver supports multisync extension, use it to
enable more than one semaphores in a tfu job.

Signed-off-by: Melissa Wen <mwen@igalia.com>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13178>
This commit is contained in:
Melissa Wen 2021-10-04 14:36:12 +01:00
parent ff8586c345
commit ad09e50129
1 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/broadcom/vulkan/v3dv_queue.c
View file

@ -841,19 +841,41 @@ handle_cl_job(struct v3dv_queue *queue,
static VkResult
handle_tfu_job(struct v3dv_queue *queue,
struct v3dv_job *job,
bool do_sem_wait)
struct v3dv_submit_info_semaphores *sems_info)
{
struct v3dv_device *device = queue->device;
const bool needs_sync = do_sem_wait || job->serialize;
const bool needs_sync = sems_info->sem_count || job->serialize;
struct drm_v3d_sem *out_syncs = NULL, *in_syncs = NULL;
mtx_lock(&device->mutex);
job->tfu.in_sync = needs_sync ? device->last_job_sync : 0;
job->tfu.out_sync = device->last_job_sync;
/* Replace single semaphore settings whenever our kernel-driver supports
* multiple semaphore extension.
*/
if (device->pdevice->caps.multisync) {
struct drm_v3d_multi_sync ms = { 0 };
set_multisync(&ms, sems_info, NULL, device, out_syncs, in_syncs,
job->serialize, V3D_TFU);
if (!ms.base.id)
return vk_error(device->instance, VK_ERROR_OUT_OF_HOST_MEMORY);
job->tfu.flags |= DRM_V3D_SUBMIT_EXTENSION;
job->tfu.extensions = (uintptr_t)(void *)&ms;
/* Disable legacy sync interface when multisync extension is used */
job->tfu.in_sync = 0;
job->tfu.out_sync = 0;
} else {
job->tfu.in_sync = needs_sync ? device->last_job_sync : 0;
job->tfu.out_sync = device->last_job_sync;
}
int ret = v3dv_ioctl(device->pdevice->render_fd,
DRM_IOCTL_V3D_SUBMIT_TFU, &job->tfu);
mtx_unlock(&device->mutex);
if (device->pdevice->caps.multisync)
multisync_free(device, out_syncs, in_syncs);
if (ret != 0) {
fprintf(stderr, "Failed to submit TFU job: %d\n", ret);
return vk_error(device, VK_ERROR_DEVICE_LOST);
@ -919,7 +941,7 @@ queue_submit_job(struct v3dv_queue *queue,
case V3DV_JOB_TYPE_GPU_CL:
return handle_cl_job(queue, job, wait_sems_info);
case V3DV_JOB_TYPE_GPU_TFU:
return handle_tfu_job(queue, job, do_sem_wait);
return handle_tfu_job(queue, job, wait_sems_info);
case V3DV_JOB_TYPE_GPU_CSD:
return handle_csd_job(queue, job, do_sem_wait);
case V3DV_JOB_TYPE_CPU_RESET_QUERIES: