diff --git a/drivers/video/rockchip/rga3/include/rga_drv.h b/drivers/video/rockchip/rga3/include/rga_drv.h index 5f95d05628eb..406720c9c5c4 100644 --- a/drivers/video/rockchip/rga3/include/rga_drv.h +++ b/drivers/video/rockchip/rga3/include/rga_drv.h @@ -79,7 +79,7 @@ #define DRIVER_MAJOR_VERISON 1 #define DRIVER_MINOR_VERSION 2 -#define DRIVER_REVISION_VERSION 4 +#define DRIVER_REVISION_VERSION 5 #define DRIVER_VERSION (STR(DRIVER_MAJOR_VERISON) "." STR(DRIVER_MINOR_VERSION) \ "." STR(DRIVER_REVISION_VERSION)) diff --git a/drivers/video/rockchip/rga3/rga2_reg_info.c b/drivers/video/rockchip/rga3/rga2_reg_info.c index 7ccc52e5a5b2..89467aa929cb 100644 --- a/drivers/video/rockchip/rga3/rga2_reg_info.c +++ b/drivers/video/rockchip/rga3/rga2_reg_info.c @@ -2458,10 +2458,10 @@ int rga2_set_reg(struct rga_job *job, struct rga_scheduler_t *scheduler) (0x1 << 8), RGA2_INT, scheduler); if (DEBUGGER_EN(TIME)) { - pr_err("sys_ctrl = %x, int = %x, set cmd use time = %lld\n", - rga_read(RGA2_SYS_CTRL, scheduler), - rga_read(RGA2_INT, scheduler), - ktime_us_delta(now, job->timestamp)); + pr_info("sys_ctrl = %x, int = %x, set cmd use time = %lld\n", + rga_read(RGA2_SYS_CTRL, scheduler), + rga_read(RGA2_INT, scheduler), + ktime_us_delta(now, job->timestamp)); } job->hw_running_time = now; diff --git a/drivers/video/rockchip/rga3/rga3_reg_info.c b/drivers/video/rockchip/rga3/rga3_reg_info.c index 2488733c139d..cc8ae098d136 100644 --- a/drivers/video/rockchip/rga3/rga3_reg_info.c +++ b/drivers/video/rockchip/rga3/rga3_reg_info.c @@ -1928,18 +1928,18 @@ int rga3_set_reg(struct rga_job *job, struct rga_scheduler_t *scheduler) rga_write(1, RGA3_INT_EN, scheduler); if (DEBUGGER_EN(MSG)) { - pr_err("sys_ctrl = %x, int_en = %x, int_raw = %x\n", - rga_read(RGA3_SYS_CTRL, scheduler), - rga_read(RGA3_INT_EN, scheduler), - rga_read(RGA3_INT_RAW, scheduler)); + pr_info("sys_ctrl = %x, int_en = %x, int_raw = %x\n", + rga_read(RGA3_SYS_CTRL, scheduler), + rga_read(RGA3_INT_EN, scheduler), + rga_read(RGA3_INT_RAW, scheduler)); - pr_err("status0 = %x, status1 = %x\n", - rga_read(RGA3_STATUS0, scheduler), - rga_read(RGA3_STATUS1, scheduler)); + pr_info("status0 = %x, status1 = %x\n", + rga_read(RGA3_STATUS0, scheduler), + rga_read(RGA3_STATUS1, scheduler)); } if (DEBUGGER_EN(TIME)) - pr_err("set cmd use time = %lld\n", ktime_us_delta(now, job->timestamp)); + pr_info("set cmd use time = %lld\n", ktime_us_delta(now, job->timestamp)); job->hw_running_time = now; job->hw_recoder_time = now; diff --git a/drivers/video/rockchip/rga3/rga_dma_buf.c b/drivers/video/rockchip/rga3/rga_dma_buf.c index ef8eee4f6f0a..7b36b70b35da 100644 --- a/drivers/video/rockchip/rga3/rga_dma_buf.c +++ b/drivers/video/rockchip/rga3/rga_dma_buf.c @@ -610,7 +610,7 @@ static int rga_viraddr_get_channel_info(struct rga_img_info_t *channel_info, size = iova_align(iovad, size); if (DEBUGGER_EN(MSG)) - pr_err("iova_align size = %ld", size); + pr_info("iova_align size = %ld", size); iova = rga_iommu_dma_alloc_iova(domain, size, scheduler->dev->coherent_dma_mask, scheduler->dev); diff --git a/drivers/video/rockchip/rga3/rga_drv.c b/drivers/video/rockchip/rga3/rga_drv.c index 064bb2929bf0..1607f1dbc194 100644 --- a/drivers/video/rockchip/rga3/rga_drv.c +++ b/drivers/video/rockchip/rga3/rga_drv.c @@ -397,7 +397,7 @@ static long rga_ioctl_cmd_config(unsigned long arg) } if (DEBUGGER_EN(MSG)) - pr_err("config cmd id = %d", rga_user_ctx.id); + pr_info("config cmd id = %d", rga_user_ctx.id); /* find internal_ctx to set cmd by user ctx (internal ctx id) */ ret = rga_job_config_by_user_ctx(&rga_user_ctx); @@ -421,7 +421,7 @@ static long rga_ioctl_cmd_end(unsigned long arg) } if (DEBUGGER_EN(MSG)) - pr_err("config end id = %d", rga_user_ctx.id); + pr_info("config end id = %d", rga_user_ctx.id); /* find internal_ctx to set cmd by user ctx (internal ctx id) */ ret = rga_job_commit_by_user_ctx(&rga_user_ctx); @@ -451,7 +451,7 @@ static long rga_ioctl_cmd_cancel(unsigned long arg) } if (DEBUGGER_EN(MSG)) - pr_err("config cancel id = %d", rga_user_ctx_id); + pr_info("config cancel id = %d", rga_user_ctx_id); /* find internal_ctx to set cmd by user ctx (internal ctx id) */ ret = rga_job_cancel_by_user_ctx(rga_user_ctx_id); @@ -998,8 +998,7 @@ static int rga_drv_probe(struct platform_device *pdev) rga_scheduler->irq = irq; - pr_err("%s, irq = %d, match scheduler\n", - match_data->irqs[0].name, irq); + pr_info("%s, irq = %d, match scheduler\n", match_data->irqs[0].name, irq); ret = devm_request_threaded_irq(dev, irq, match_data->irqs[0].irq_hdl, @@ -1051,8 +1050,8 @@ static int rga_drv_probe(struct platform_device *pdev) #endif //CONFIG_ROCKCHIP_FPGA rga_scheduler->ops->get_version(rga_scheduler); - pr_err("%s driver loaded successfully ver:%s\n", - dev_driver_string(dev), rga_scheduler->version.str); + pr_info("%s driver loaded successfully ver:%s\n", + dev_driver_string(dev), rga_scheduler->version.str); /* TODO: get by hw version, Currently only supports judgment 1106. */ if (rga_scheduler->core == RGA3_SCHEDULER_CORE0 || @@ -1075,7 +1074,7 @@ static int rga_drv_probe(struct platform_device *pdev) pm_runtime_put_sync(&pdev->dev); - pr_err("probe successfully\n"); + pr_info("%s probe successfully\n", dev_driver_string(dev)); return 0; diff --git a/drivers/video/rockchip/rga3/rga_job.c b/drivers/video/rockchip/rga3/rga_job.c index bfde0c08dea7..f5c3d1b48322 100644 --- a/drivers/video/rockchip/rga3/rga_job.c +++ b/drivers/video/rockchip/rga3/rga_job.c @@ -474,8 +474,8 @@ static void rga_job_finish_and_next(struct rga_scheduler_t *rga_scheduler, if (DEBUGGER_EN(TIME)) { now = ktime_get(); - pr_err("hw use time = %lld\n", ktime_us_delta(now, job->hw_running_time)); - pr_err("(pid:%d) job done use time = %lld\n", job->pid, + pr_info("hw use time = %lld\n", ktime_us_delta(now, job->hw_running_time)); + pr_info("(pid:%d) job done use time = %lld\n", job->pid, ktime_us_delta(now, job->timestamp)); } @@ -672,7 +672,7 @@ static inline int rga_job_wait(struct rga_scheduler_t *rga_scheduler, now = ktime_get(); if (DEBUGGER_EN(TIME)) - pr_err("%s use time = %lld\n", __func__, + pr_info("%s use time = %lld\n", __func__, ktime_us_delta(now, job->hw_running_time)); return ret; @@ -977,7 +977,7 @@ int rga_job_commit(struct rga_req *rga_command_base, struct rga_internal_ctx_t * ctx->out_fence_fd = rga_command_base->out_fence_fd; if (DEBUGGER_EN(MSG)) - pr_err("in_fence_fd = %d", + pr_info("in_fence_fd = %d", rga_command_base->in_fence_fd); /* if input fence is valiable */ diff --git a/drivers/video/rockchip/rga3/rga_policy.c b/drivers/video/rockchip/rga3/rga_policy.c index 1d9a0d9e25a1..c8f2ce76ba65 100644 --- a/drivers/video/rockchip/rga3/rga_policy.c +++ b/drivers/video/rockchip/rga3/rga_policy.c @@ -192,7 +192,7 @@ int rga_job_assign(struct rga_job *job) scheduler = rga_drvdata->rga_scheduler[i]; if (DEBUGGER_EN(MSG)) - pr_err("start policy on core = %d", scheduler->core); + pr_info("start policy on core = %d", scheduler->core); if (scheduler->core == RGA2_SCHEDULER_CORE0 && job->flags & RGA_JOB_UNSUPPORT_RGA2) { @@ -204,7 +204,7 @@ int rga_job_assign(struct rga_job *job) if (feature > 0) { if (!(feature & data->feature)) { if (DEBUGGER_EN(MSG)) - pr_err("core = %d, break on feature", + pr_info("core = %d, break on feature", scheduler->core); continue; } @@ -217,7 +217,7 @@ int rga_job_assign(struct rga_job *job) (!(src1->rd_mode & data->win[1].rd_mode)) || (!(dst->rd_mode & data->win[2].rd_mode))) { if (DEBUGGER_EN(MSG)) - pr_err("core = %d, ABC break on rd_mode", + pr_info("core = %d, ABC break on rd_mode", scheduler->core); continue; } @@ -225,7 +225,7 @@ int rga_job_assign(struct rga_job *job) if ((!(src0->rd_mode & data->win[0].rd_mode)) || (!(dst->rd_mode & data->win[2].rd_mode))) { if (DEBUGGER_EN(MSG)) - pr_err("core = %d, ABB break on rd_mode", + pr_info("core = %d, ABB break on rd_mode", scheduler->core); continue; } @@ -233,14 +233,14 @@ int rga_job_assign(struct rga_job *job) if (!rga_check_scale(data, rga_base)) { if (DEBUGGER_EN(MSG)) - pr_err("core = %d, break on rga_check_scale", + pr_info("core = %d, break on rga_check_scale", scheduler->core); continue; } if (!rga_check_src0(data, src0)) { if (DEBUGGER_EN(MSG)) - pr_err("core = %d, break on rga_check_src0", + pr_info("core = %d, break on rga_check_src0", scheduler->core); continue; } @@ -248,8 +248,8 @@ int rga_job_assign(struct rga_job *job) if (src1->yrgb_addr > 0) { if (!rga_check_src1(data, src1)) { if (DEBUGGER_EN(MSG)) - pr_err("core = %d, break on rga_check_src1", - scheduler->core); + pr_info("core = %d, break on rga_check_src1", + scheduler->core); continue; } } @@ -257,7 +257,7 @@ int rga_job_assign(struct rga_job *job) if (!rga_check_dst(data, dst)) { if (DEBUGGER_EN(MSG)) - pr_err("core = %d, break on rga_check_dst", + pr_info("core = %d, break on rga_check_dst", scheduler->core); continue; }