video: rockchip: rga3: Support soft batch mode

Split the request into multiple jobs and execute them.

Signed-off-by: Yu Qiaowei <[email protected]>
Change-Id: I96d044cb52ed20e452154c400a1454bcea014bfa

Author: Yu Qiaowei

drivers/video/rockchip/rga3/include/rga.h

@@ -15,11 +15,10 @@
 #define RGA_IOC_GET_HW_VERSION		RGA_IOR(0x2, struct rga_hw_versions_t)
 #define RGA_IOC_IMPORT_BUFFER		RGA_IOWR(0x3, struct rga_buffer_pool)
 #define RGA_IOC_RELEASE_BUFFER		RGA_IOW(0x4, struct rga_buffer_pool)
-
-#define RGA_START_CONFIG		RGA_IOR(0x5, uint32_t)
-#define RGA_END_CONFIG			RGA_IOWR(0x6, struct rga_user_ctx_t)
-#define RGA_CMD_CONFIG			RGA_IOWR(0x7, struct rga_user_ctx_t)
-#define RGA_CANCEL_CONFIG		RGA_IOWR(0x8, uint32_t)
+#define RGA_IOC_REQUEST_CREATE		RGA_IOR(0x5, uint32_t)
+#define RGA_IOC_REQUEST_SUBMIT		RGA_IOWR(0x6, struct rga_user_request)
+#define RGA_IOC_REQUEST_CONFIG		RGA_IOWR(0x7, struct rga_user_request)
+#define RGA_IOC_REQUEST_CANCEL		RGA_IOWR(0x8, uint32_t)
 
 #define RGA_BLIT_SYNC			0x5017
 #define RGA_BLIT_ASYNC			0x5018
@@ -32,7 +31,7 @@
 #define RGA_IMPORT_DMA			0x601d
 #define RGA_RELEASE_DMA			0x601e
 
-#define RGA_CMD_NUM_MAX 1
+#define RGA_TASK_NUM_MAX		50
 
 #define RGA_OUT_OF_RESOURCES		-10
 #define RGA_MALLOC_ERROR		-11
@@ -848,16 +847,18 @@ struct rga_mpi_job_t {
 	int ctx_id;
 };
 
-struct rga_user_ctx_t {
-	uint64_t cmd_ptr;
-	uint32_t cmd_num;
+struct rga_user_request {
+	uint64_t task_ptr;
+	uint32_t task_num;
 	uint32_t id;
 	uint32_t sync_mode;
-	uint32_t out_fence_fd;
+	uint32_t release_fence_fd;
 
 	uint32_t mpi_config_flags;
 
-	uint8_t reservr[124];
+	uint32_t acquire_fence_fd;
+
+	uint8_t reservr[120];
 };
 
 int rga_mpi_commit(struct rga_mpi_job_t *mpi_job);

drivers/video/rockchip/rga3/include/rga_debugger.h

@@ -129,7 +129,7 @@ static inline int rga_procfs_init(void)
 #endif /* #ifdef CONFIG_ROCKCHIP_RGA_DEBUGGER */
 
 void rga_cmd_print_debug_info(struct rga_req *req);
-void rga_ctx_cache_cmd_debug_info(struct seq_file *m, struct rga_req *req);
+void rga_request_task_debug_info(struct seq_file *m, struct rga_req *req);
 void rga_dump_external_buffer(struct rga_external_buffer *buffer);
 
 #endif /* #ifndef _RGA_DEBUGGER_H_ */

drivers/video/rockchip/rga3/include/rga_drv.h

@@ -267,7 +267,7 @@ struct rga_job {
 	/* The time only for hrtimer to calculate the load */
 	ktime_t hw_recoder_time;
 	unsigned int flags;
-	int ctx_id;
+	int request_id;
 	int priority;
 	int core;
 	int ret;
@@ -310,24 +310,26 @@ struct rga_scheduler_t {
 	struct rga_timer timer;
 };
 
-struct rga_internal_ctx_t {
-	struct rga_req *cached_cmd;
-	struct rga_session *session;
-
-	int cmd_num;
-	int flags;
-	int id;
+struct rga_request {
+	struct rga_req *task_list;
+	int task_count;
+	uint32_t finished_task_count;
 
-	uint8_t mpi_config_flags;
+	bool use_batch_mode;
+	bool is_running;
 	uint32_t sync_mode;
 
-	uint32_t finished_job_count;
+	int32_t acquire_fence_fd;
+	int32_t release_fence_fd;
+	struct dma_fence *release_fence;
+	spinlock_t fence_lock;
 
-	bool use_batch_mode;
-	bool is_running;
+	wait_queue_head_t finished_wq;
 
-	struct dma_fence *out_fence;
-	int32_t out_fence_fd;
+	int flags;
+	uint8_t mpi_config_flags;
+	int id;
+	struct rga_session *session;
 
 	spinlock_t lock;
 	struct kref refcount;
@@ -336,18 +338,18 @@ struct rga_internal_ctx_t {
 	/* TODO: add some common work */
 };
 
-struct rga_pending_ctx_manager {
+struct rga_pending_request_manager {
 	struct mutex lock;
 
 	/*
-	 * @ctx_id_idr:
+	 * @request_idr:
 	 *
-	 * Mapping of ctx id to object pointers. Used by the GEM
+	 * Mapping of request id to object pointers. Used by the GEM
 	 * subsystem. Protected by @lock.
 	 */
-	struct idr ctx_id_idr;
+	struct idr request_idr;
 
-	int ctx_count;
+	int request_count;
 };
 
 struct rga_session_manager {
@@ -370,7 +372,7 @@ struct rga_drvdata_t {
 	struct rga_mm *mm;
 
 	/* rga_job pending manager, import by RGA_START_CONFIG */
-	struct rga_pending_ctx_manager *pend_ctx_manager;
+	struct rga_pending_request_manager *pend_request_manager;
 
 	struct rga_session_manager *session_manager;
 

drivers/video/rockchip/rga3/include/rga_job.h

@@ -26,25 +26,27 @@ struct rga_scheduler_t *rga_job_get_scheduler(struct rga_job *job);
 void rga_job_session_destroy(struct rga_session *session);
 
 void rga_job_done(struct rga_scheduler_t *scheduler, int ret);
-int rga_job_commit(struct rga_req *rga_command_base, struct rga_internal_ctx_t *ctx);
-
-int rga_job_mpi_commit(struct rga_req *rga_command_base, struct rga_internal_ctx_t *ctx);
+struct rga_job *rga_job_commit(struct rga_req *rga_command_base, struct rga_request *request);
+int rga_job_mpi_commit(struct rga_req *rga_command_base, struct rga_request *request);
 
 int rga_job_assign(struct rga_job *job);
 
-int rga_ctx_manager_init(struct rga_pending_ctx_manager **ctx_manager_session);
-int rga_ctx_manager_remove(struct rga_pending_ctx_manager **ctx_manager_session);
 
-struct rga_internal_ctx_t *
-	rga_internal_ctx_lookup(struct rga_pending_ctx_manager *ctx_manager, uint32_t id);
+int rga_request_check(struct rga_user_request *req);
+struct rga_request *rga_request_lookup(struct rga_pending_request_manager *request_manager,
+				       uint32_t id);
+
+int rga_request_commit(struct rga_request *user_request);
+int rga_request_put(struct rga_request *request);
+void rga_request_get(struct rga_request *request);
+uint32_t rga_request_alloc(uint32_t flags, struct rga_session *session);
 
-uint32_t rga_internal_ctx_alloc_to_get_idr_id(uint32_t flags, struct rga_session *session);
+struct rga_request *rga_request_config(struct rga_user_request *user_request);
+int rga_request_submit(struct rga_request *request);
+int rga_request_release_signal(struct rga_scheduler_t *scheduler, struct rga_job *job);
 
-void rga_internal_ctx_kref_release(struct kref *ref);
-int rga_internal_ctx_config_by_user_ctx(struct rga_user_ctx_t *user_ctx);
-int rga_internal_ctx_commit_by_user_ctx(struct rga_user_ctx_t *user_ctx);
-int rga_internal_ctx_cancel_by_user_ctx(uint32_t ctx_id);
-int rga_internal_ctx_signal(struct rga_scheduler_t *scheduler, struct rga_job *job);
+int rga_request_manager_init(struct rga_pending_request_manager **request_manager_session);
+int rga_request_manager_remove(struct rga_pending_request_manager **request_manager_session);
 
 struct rga_job *
 rga_scheduler_get_pending_job_list(struct rga_scheduler_t *scheduler);

drivers/video/rockchip/rga3/rga_debugger.c

@@ -277,51 +277,51 @@ static int rga_mm_session_show(struct seq_file *m, void *data)
 	return 0;
 }
 
-static int rga_ctx_manager_show(struct seq_file *m, void *data)
+static int rga_request_manager_show(struct seq_file *m, void *data)
 {
 	int id, i;
-	struct rga_pending_ctx_manager *ctx_manager;
-	struct rga_internal_ctx_t *ctx;
-	struct rga_req *cached_cmd;
+	struct rga_pending_request_manager *request_manager;
+	struct rga_request *request;
+	struct rga_req *task_list;
 	unsigned long flags;
-	int cmd_num = 0;
-	int finished_job_count = 0;
+	int task_count = 0;
+	int finished_task_count = 0;
 
-	ctx_manager = rga_drvdata->pend_ctx_manager;
+	request_manager = rga_drvdata->pend_request_manager;
 
-	seq_puts(m, "rga internal ctx dump:\n");
-	seq_printf(m, "ctx count = %d\n", ctx_manager->ctx_count);
+	seq_puts(m, "rga internal request dump:\n");
+	seq_printf(m, "request count = %d\n", request_manager->request_count);
 	seq_puts(m, "===============================================================\n");
 
-	mutex_lock(&ctx_manager->lock);
+	mutex_lock(&request_manager->lock);
 
-	idr_for_each_entry(&ctx_manager->ctx_id_idr, ctx, id) {
-		seq_printf(m, "------------------ ctx: %d ------------------\n", ctx->id);
+	idr_for_each_entry(&request_manager->request_idr, request, id) {
+		seq_printf(m, "------------------ request: %d ------------------\n", request->id);
 
-		spin_lock_irqsave(&ctx->lock, flags);
+		spin_lock_irqsave(&request->lock, flags);
 
-		cmd_num = ctx->cmd_num;
-		finished_job_count = ctx->finished_job_count;
-		cached_cmd = ctx->cached_cmd;
+		task_count = request->task_count;
+		finished_task_count = request->finished_task_count;
+		task_list = request->task_list;
 
-		spin_unlock_irqrestore(&ctx->lock, flags);
+		spin_unlock_irqrestore(&request->lock, flags);
 
-		if (cached_cmd == NULL) {
-			seq_puts(m, "\t can not find cached cmd from id\n");
+		if (task_list == NULL) {
+			seq_puts(m, "\t can not find task list from id\n");
 			continue;
 		}
 
 		seq_printf(m, "\t set cmd num: %d, finish job sum: %d\n",
-				cmd_num, finished_job_count);
+				task_count, finished_task_count);
 
 		seq_puts(m, "\t cmd dump:\n\n");
 
-		for (i = 0; i < ctx->cmd_num; i++)
-			rga_ctx_cache_cmd_debug_info(m, &(cached_cmd[i]));
+		for (i = 0; i < request->task_count; i++)
+			rga_request_task_debug_info(m, &(task_list[i]));
 
 	}
 
-	mutex_unlock(&ctx_manager->lock);
+	mutex_unlock(&request_manager->lock);
 
 	return 0;
 }
@@ -333,7 +333,7 @@ struct rga_debugger_list rga_debugger_root_list[] = {
 	{"load", rga_load_show, NULL, NULL},
 	{"scheduler_status", rga_scheduler_show, NULL, NULL},
 	{"mm_session", rga_mm_session_show, NULL, NULL},
-	{"ctx_manager", rga_ctx_manager_show, NULL, NULL},
+	{"request_manager", rga_request_manager_show, NULL, NULL},
 };
 
 static ssize_t rga_debugger_write(struct file *file, const char __user *ubuf,
@@ -604,7 +604,7 @@ int rga_procfs_init(void)
 }
 #endif /* #ifdef CONFIG_ROCKCHIP_RGA_PROC_FS */
 
-void rga_ctx_cache_cmd_debug_info(struct seq_file *m, struct rga_req *req)
+void rga_request_task_debug_info(struct seq_file *m, struct rga_req *req)
 {
 	seq_printf(m, "\t\t rotate_mode = %d\n", req->rotate_mode);
 	seq_printf(m, "\t\t src: y = %lx uv = %lx v = %lx aw = %d ah = %d vw = %d vh = %d\n",