diff --git a/src/asahi/lib/agx_device.c b/src/asahi/lib/agx_device.c index 88b6264dfab..9055cd44fe0 100644 --- a/src/asahi/lib/agx_device.c +++ b/src/asahi/lib/agx_device.c @@ -339,7 +339,6 @@ agx_open_device(void *memctx, struct agx_device *dev) &dev->usc_heap, dev->params.vm_shader_start, dev->params.vm_shader_end - dev->params.vm_shader_start + 1); - dev->queue_id = agx_create_command_queue(dev, 0 /* TODO: CAPS */); agx_get_global_ids(dev); glsl_type_singleton_init_or_ref(); @@ -369,16 +368,6 @@ agx_create_command_queue(struct agx_device *dev, uint32_t caps) unreachable("Linux UAPI not yet upstream"); } -int -agx_submit_single(struct agx_device *dev, enum drm_asahi_cmd_type cmd_type, - uint32_t barriers, struct drm_asahi_sync *in_syncs, - unsigned in_sync_count, struct drm_asahi_sync *out_syncs, - unsigned out_sync_count, void *cmdbuf, uint32_t result_handle, - uint32_t result_off, uint32_t result_size) -{ - unreachable("Linux UAPI not yet upstream"); -} - int agx_import_sync_file(struct agx_device *dev, struct agx_bo *bo, int fd) { diff --git a/src/asahi/lib/agx_device.h b/src/asahi/lib/agx_device.h index 787da7d8ba7..d0b9ea3c9f3 100644 --- a/src/asahi/lib/agx_device.h +++ b/src/asahi/lib/agx_device.h @@ -83,9 +83,6 @@ struct agx_device { /* VM handle */ uint32_t vm_id; - /* Queue handle */ - uint32_t queue_id; - /* VMA heaps */ simple_mtx_t vma_lock; uint64_t shader_base; @@ -136,13 +133,6 @@ uint64_t agx_get_global_id(struct agx_device *dev); uint32_t agx_create_command_queue(struct agx_device *dev, uint32_t caps); -int agx_submit_single(struct agx_device *dev, enum drm_asahi_cmd_type cmd_type, - uint32_t barriers, struct drm_asahi_sync *in_syncs, - unsigned in_sync_count, struct drm_asahi_sync *out_syncs, - unsigned out_sync_count, void *cmdbuf, - uint32_t result_handle, uint32_t result_off, - uint32_t result_size); - int agx_import_sync_file(struct agx_device *dev, struct agx_bo *bo, int fd); int agx_export_sync_file(struct agx_device *dev, struct agx_bo *bo); diff --git a/src/gallium/drivers/asahi/agx_batch.c b/src/gallium/drivers/asahi/agx_batch.c index 186cc353de4..75b464328c3 100644 --- a/src/gallium/drivers/asahi/agx_batch.c +++ b/src/gallium/drivers/asahi/agx_batch.c @@ -614,10 +614,9 @@ agx_batch_submit(struct agx_context *ctx, struct agx_batch *batch, agx_add_sync(in_syncs, &in_sync_count, agx_get_in_sync(ctx)); /* Submit! */ - agx_submit_single( - dev, cmd_type, barriers, in_syncs, in_sync_count, &out_sync, 1, cmdbuf, - feedback ? ctx->result_buf->handle : 0, feedback ? batch->result_off : 0, - feedback ? sizeof(union agx_batch_result) : 0); + /* TODO: UAPI */ + (void)screen; + (void)out_sync; /* Now stash our batch fence into any shared BOs. */ if (shared_bo_count) {