OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

agx: remove internal agx_device queue

Browse Source 
The internal queue is unusued by agxv. An earlier commit changed the gallium driver to initialize it's own queue.

Signed-off-by: i509VCB <git@i509.me>
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26963>
This commit is contained in:
i509VCB
2023-12-30 20:57:17 -06:00
committed by Alyssa Rosenzweig
parent 8f52e72686
commit d30b0adddb
3 changed files with 3 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/asahi/lib/agx_device.c
View File

@@ -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)
{

10
src/asahi/lib/agx_device.h
View File

@@ -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);

7
src/gallium/drivers/asahi/agx_batch.c
View File

@@ -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) {