[Mesa-dev] [PATCH 4/5] panfrost: Pass the context BOs to the kernel so they aren't unmapped while in use

[Tomeu Vizoso]

Signed-off-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
---
 src/gallium/drivers/panfrost/pan_drm.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/panfrost/pan_drm.c b/src/gallium/drivers/panfrost/pan_drm.c
index 0a7cf47c6a36..887bf19148e7 100644
--- a/src/gallium/drivers/panfrost/pan_drm.c
+++ b/src/gallium/drivers/panfrost/pan_drm.c
@@ -206,7 +206,7 @@ panfrost_drm_submit_job(struct panfrost_context *ctx, u64 job_desc, int reqs, st
         struct panfrost_screen *screen = pan_screen(gallium->screen);
 	struct panfrost_drm *drm = (struct panfrost_drm *)screen->driver;
         struct drm_panfrost_submit submit = {0,};
-        int bo_handles[2];
+        int bo_handles[7];
 
         submit.in_syncs = (u64) (uintptr_t) &ctx->out_sync;
         submit.in_sync_count = 1;
@@ -216,8 +216,6 @@ panfrost_drm_submit_job(struct panfrost_context *ctx, u64 job_desc, int reqs, st
 	submit.jc = job_desc;
 	submit.requirements = reqs;
 
-	/* TODO: We should be passing the transient data as a BO, so the kernel doesn't unmap while in use */
-
 	if (surf) {
 		struct panfrost_resource *res = pan_resource(surf->texture);
 		assert(res->bo->gem_handle > 0);
@@ -227,6 +225,14 @@ panfrost_drm_submit_job(struct panfrost_context *ctx, u64 job_desc, int reqs, st
 			bo_handles[submit.bo_handle_count++] = res->bo->checksum_slab.gem_handle;
 	}
 
+	/* TODO: Add here the transient pools */
+	bo_handles[submit.bo_handle_count++] = ctx->shaders.gem_handle;
+	bo_handles[submit.bo_handle_count++] = ctx->scratchpad.gem_handle;
+	bo_handles[submit.bo_handle_count++] = ctx->tiler_heap.gem_handle;
+	bo_handles[submit.bo_handle_count++] = ctx->varying_mem.gem_handle;
+	bo_handles[submit.bo_handle_count++] = ctx->misc_0.gem_handle;
+	submit.bo_handles = (u64)bo_handles;
+
         /* Dump memory _before_ submitting so we're not corrupted with actual GPU results */
         pantrace_dump_memory();
 
-- 
2.20.1