diff --git a/drivers/video/rockchip/rga3/include/rga_drv.h b/drivers/video/rockchip/rga3/include/rga_drv.h index 8e4ce19dcd57..2feb4e4bc294 100644 --- a/drivers/video/rockchip/rga3/include/rga_drv.h +++ b/drivers/video/rockchip/rga3/include/rga_drv.h @@ -137,33 +137,6 @@ struct rga_iommu_dma_cookie { struct iova_domain iovad; }; -/* - * legacy: Wait for the import process to completely replace the current - * dma_map and remove it - */ -struct rga_dma_buffer_t { - /* DMABUF information */ - struct dma_buf *dma_buf; - struct dma_buf_attachment *attach; - struct sg_table *sgt; - - dma_addr_t iova; - unsigned long size; - void *vaddr; - enum dma_data_direction dir; - - /* It indicates whether the buffer is cached */ - bool cached; - - struct list_head link; - struct kref refcount; - - struct iommu_domain *domain; - struct rga_iommu_dma_cookie *cookie; - - bool use_viraddr; -}; - struct rga_dma_buffer { /* DMABUF information */ struct dma_buf *dma_buf; @@ -232,23 +205,6 @@ struct rga_internal_buffer { struct rga_session *session; }; -/* - * yqw add: - * In order to use the virtual address to refresh the cache, - * it may be merged into sgt later. - */ -struct rga2_mmu_other_t { - uint32_t *MMU_src0_base; - uint32_t *MMU_src1_base; - uint32_t *MMU_dst_base; - uint32_t MMU_src0_count; - uint32_t MMU_src1_count; - uint32_t MMU_dst_count; - - uint32_t MMU_len; - bool MMU_map; -}; - struct rga_scheduler_t; struct rga_session { @@ -292,26 +248,14 @@ struct rga_job { struct rga_full_csc full_csc; struct rga_pre_intr_info pre_intr_info; - struct rga_dma_buffer_t *rga_dma_buffer_src0; - struct rga_dma_buffer_t *rga_dma_buffer_src1; - struct rga_dma_buffer_t *rga_dma_buffer_dst; - /* used by rga2 */ - struct rga_dma_buffer_t *rga_dma_buffer_els; - struct rga_job_buffer src_buffer; struct rga_job_buffer src1_buffer; struct rga_job_buffer dst_buffer; /* used by rga2 */ struct rga_job_buffer els_buffer; - struct dma_buf *dma_buf_src0; - struct dma_buf *dma_buf_src1; - struct dma_buf *dma_buf_dst; - struct dma_buf *dma_buf_els; - /* for rga2 virtual_address */ struct mm_struct *mm; - struct rga2_mmu_other_t vir_page_table; struct dma_fence *out_fence; struct dma_fence *in_fence; diff --git a/drivers/video/rockchip/rga3/include/rga_job.h b/drivers/video/rockchip/rga3/include/rga_job.h index ac12af4e4c40..b489f786a818 100644 --- a/drivers/video/rockchip/rga3/include/rga_job.h +++ b/drivers/video/rockchip/rga3/include/rga_job.h @@ -28,8 +28,7 @@ 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_mpi_job_t *mpi_job, struct rga_internal_ctx_t *ctx); +int rga_job_mpi_commit(struct rga_req *rga_command_base, struct rga_internal_ctx_t *ctx); int rga_job_assign(struct rga_job *job); diff --git a/drivers/video/rockchip/rga3/rga_drv.c b/drivers/video/rockchip/rga3/rga_drv.c index 8e2df9b972b8..c8b4d849bb77 100644 --- a/drivers/video/rockchip/rga3/rga_drv.c +++ b/drivers/video/rockchip/rga3/rga_drv.c @@ -205,7 +205,7 @@ int rga_mpi_commit(struct rga_mpi_job_t *mpi_job) if (DEBUGGER_EN(MSG)) rga_cmd_print_debug_info(&mpi_cmd); - ret = rga_job_mpi_commit(&mpi_cmd, mpi_job, ctx); + ret = rga_job_mpi_commit(&mpi_cmd, ctx); if (ret < 0) { if (ret == -ERESTARTSYS) { if (DEBUGGER_EN(MSG)) diff --git a/drivers/video/rockchip/rga3/rga_job.c b/drivers/video/rockchip/rga3/rga_job.c index eadecc37f377..e4ae5deb5a26 100644 --- a/drivers/video/rockchip/rga3/rga_job.c +++ b/drivers/video/rockchip/rga3/rga_job.c @@ -774,8 +774,7 @@ running_job_abort: return ret; } -int rga_job_mpi_commit(struct rga_req *rga_command_base, - struct rga_mpi_job_t *mpi_job, 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 *job = NULL; struct rga_scheduler_t *scheduler = NULL; @@ -787,12 +786,6 @@ int rga_job_mpi_commit(struct rga_req *rga_command_base, return -ENOMEM; } - if (mpi_job != NULL) { - job->dma_buf_src0 = mpi_job->dma_buf_src0; - job->dma_buf_src1 = mpi_job->dma_buf_src1; - job->dma_buf_dst = mpi_job->dma_buf_dst; - } - job->ctx_id = ctx->id; if (ctx->sync_mode == RGA_BLIT_ASYNC) {