shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

video: rockchip: rga3: Remove useless structures

Browse Source 
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I28e8843c8fc181bdc5652f226e905edd65ba5e6b
This commit is contained in:
Yu Qiaowei
2022-04-24 17:10:55 +08:00
committed by Tao Huang
parent 59483bb7f3
commit 4214a1b887
4 changed files with 3 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
drivers/video/rockchip/rga3/include/rga_drv.h
View File

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

3
drivers/video/rockchip/rga3/include/rga_job.h
View File

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

2
drivers/video/rockchip/rga3/rga_drv.c
View File

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

9
drivers/video/rockchip/rga3/rga_job.c
View File

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