fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-22 03:10:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

anv: Switch Xe KMD vm bind to sync

Browse source 
It was never actually async as it was doing a DRM_IOCTL_SYNCOBJ_WAIT
right after DRM_IOCTL_XE_VM_BIND but it was required to allow the
partial binds required by sparse.
But it is now fixed and we can switch back to sync vm bind.

In future we will switch back to async vm bind to improve performance
but this time it will be properly implemented.

Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25300>
This commit is contained in:
José Roberto de Souza 2023-09-29 14:09:19 -07:00 • committed by Marge Bot
parent 531605accf
commit bd546f9e54
2 changed files with 6 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/intel/vulkan/xe/anv_device.c
View file

@ -37,8 +37,7 @@ bool anv_xe_device_destroy_vm(struct anv_device *device)
VkResult anv_xe_device_setup_vm(struct anv_device *device)
{
struct drm_xe_vm_create create = {
.flags = DRM_XE_VM_CREATE_ASYNC_DEFAULT |
DRM_XE_VM_CREATE_SCRATCH_PAGE,
.flags = DRM_XE_VM_CREATE_SCRATCH_PAGE,
};
if (intel_ioctl(device->fd, DRM_IOCTL_XE_VM_CREATE, &create) != 0)
return vk_errorf(device, VK_ERROR_INITIALIZATION_FAILED,

40
src/intel/vulkan/xe/anv_kmd_backend.c
View file

@ -97,30 +97,19 @@ static inline int
xe_vm_bind_op(struct anv_device *device, int num_binds,
struct anv_vm_bind *binds)
{
uint32_t syncobj_handle;
int ret = drmSyncobjCreate(device->fd, 0, &syncobj_handle);
if (ret)
return ret;
int ret;
struct drm_xe_sync sync = {
.flags = DRM_XE_SYNC_SYNCOBJ | DRM_XE_SYNC_SIGNAL,
.handle = syncobj_handle,
};
struct drm_xe_vm_bind args = {
.vm_id = device->vm_id,
.num_binds = num_binds,
.bind = {},
.num_syncs = 1,
.syncs = (uintptr_t)&sync,
};
STACK_ARRAY(struct drm_xe_vm_bind_op, xe_binds_stackarray, num_binds);
struct drm_xe_vm_bind_op *xe_binds;
if (num_binds > 1) {
if (!xe_binds_stackarray) {
ret = -ENOMEM;
goto out_syncobj;
}
if (!xe_binds_stackarray)
return -ENOMEM;
xe_binds = xe_binds_stackarray;
args.vector_of_binds = (uintptr_t)xe_binds;
@ -140,11 +129,7 @@ xe_vm_bind_op(struct anv_device *device, int num_binds,
.addr = intel_48b_address(bind->address),
.tile_mask = 0,
.op = XE_VM_BIND_OP_UNMAP,
/* TODO: do proper error handling here, once the way to do it is
* settled. As of right now the final interface is still under
* discussion.
*/
.flags = XE_VM_BIND_FLAG_ASYNC,
.flags = 0,
.region = 0,
};
@ -167,23 +152,8 @@ xe_vm_bind_op(struct anv_device *device, int num_binds,
}
ret = intel_ioctl(device->fd, DRM_IOCTL_XE_VM_BIND, &args);
if (ret)
goto bind_error;
struct drm_syncobj_wait wait = {
.handles = (uintptr_t)&syncobj_handle,
.timeout_nsec = INT64_MAX,
.count_handles = 1,
.flags = 0,
.first_signaled = 0,
.pad = 0,
};
ret = intel_ioctl(device->fd, DRM_IOCTL_SYNCOBJ_WAIT, &wait);
bind_error:
STACK_ARRAY_FINISH(xe_binds_stackarray);
out_syncobj:
drmSyncobjDestroy(device->fd, syncobj_handle);
return ret;
}