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

video: rockchip: rga3: modify the check of virtual stride

Browse Source 
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I6c955fc1c746629142494c4c6d6f2f49c94d0d7c
This commit is contained in:
Yu Qiaowei
2022-06-22 16:27:51 +08:00
committed by Tao Huang
parent fc308534be
commit 560bc18d7e
4 changed files with 105 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/video/rockchip/rga3/include/rga_hw_config.h
View File

@@ -56,6 +56,7 @@ struct rga_hw_data {
unsigned int max_downscale_factor;
uint32_t byte_stride_align;
uint32_t max_byte_stride;
const struct rga_win_data *win;
unsigned int win_size;
@@ -67,4 +68,11 @@ extern const struct rga_hw_data rga3_data;
extern const struct rga_hw_data rga2e_data;
extern const struct rga_hw_data rga2e_1106_data;
/* Returns false if in range, true otherwise */
static inline bool rga_hw_out_of_range(const struct rga_rect_range *range, int width, int height)
{
return (width > range->max.width || height > range->max.height ||
width < range->min.width || height < range->min.height);
}
#endif /* __LINUX_RGA_HW_CONFIG_H_ */

62
drivers/video/rockchip/rga3/rga2_reg_info.c
View File

@@ -2078,55 +2078,47 @@ void rga2_soft_reset(struct rga_scheduler_t *scheduler)
pr_err("soft reset timeout.\n");
}
static int rga2_check_param(const struct rga2_req *req)
static int rga2_check_param(const struct rga_hw_data *data, const struct rga2_req *req)
{
if (!((req->render_mode == COLOR_FILL_MODE))) {
if (unlikely
((req->src.act_w <= 0) || (req->src.act_w > 8192)
|| (req->src.act_h <= 0) || (req->src.act_h > 8192))) {
if (unlikely(rga_hw_out_of_range(&data->input_range,
req->src.act_w, req->src.act_h))) {
pr_err("invalid src resolution act_w = %d, act_h = %d\n",
req->src.act_w, req->src.act_h);
return -EINVAL;
}
}
if (!((req->render_mode == COLOR_FILL_MODE))) {
if (unlikely
((req->src.vir_w <= 0) || (req->src.vir_w > 8192)
|| (req->src.vir_h <= 0) || (req->src.vir_h > 8192))) {
pr_err("invalid src resolution vir_w = %d, vir_h = %d\n",
req->src.vir_w, req->src.vir_h);
if (unlikely(req->src.vir_w * rga_get_pixel_stride_from_format(req->src.format) >
data->max_byte_stride * 8)) {
pr_err("invalid src stride, stride = %d, max_byte_stride = %d\n",
req->src.vir_w, data->max_byte_stride);
return -EINVAL;
}
if (unlikely(req->src.vir_w < req->src.act_w)) {
pr_err("invalid src_vir_w act_w = %d, vir_w = %d\n",
req->src.act_w, req->src.vir_w);
return -EINVAL;
}
}
/* check dst width and height */
if (unlikely
((req->dst.act_w <= 0) || (req->dst.act_w > 4096)
|| (req->dst.act_h <= 0) || (req->dst.act_h > 4096))) {
if (unlikely(rga_hw_out_of_range(&data->output_range, req->dst.act_w, req->dst.act_h))) {
pr_err("invalid dst resolution act_w = %d, act_h = %d\n",
req->dst.act_w, req->dst.act_h);
req->dst.act_w, req->dst.act_h);
return -EINVAL;
}
if (unlikely
((req->dst.vir_w <= 0) || (req->dst.vir_w > 4096)
|| (req->dst.vir_h <= 0) || (req->dst.vir_h > 4096))) {
pr_err("invalid dst resolution vir_w = %d, vir_h = %d\n",
req->dst.vir_w, req->dst.vir_h);
if (unlikely(req->dst.vir_w * rga_get_pixel_stride_from_format(req->dst.format) >
data->max_byte_stride * 8)) {
pr_err("invalid dst stride, stride = %d, max_byte_stride = %d\n",
req->dst.vir_w, data->max_byte_stride);
return -EINVAL;
}
//check src_vir_w
if (unlikely(req->src.vir_w < req->src.act_w)) {
pr_err("invalid src_vir_w act_w = %d, vir_w = %d\n",
req->src.act_w, req->src.vir_w);
return -EINVAL;
}
//check dst_vir_w
if (unlikely(req->dst.vir_w < req->dst.act_w)) {
if (req->rotate_mode != 1) {
pr_err("invalid dst_vir_w act_h = %d, vir_h = %d\n",
req->dst.act_w, req->dst.vir_w);
req->dst.act_w, req->dst.vir_w);
return -EINVAL;
}
}
@@ -2216,12 +2208,10 @@ int rga2_init_reg(struct rga_job *job)
int ret = 0;
struct rga_scheduler_t *scheduler = NULL;
scheduler = rga_job_get_scheduler(job);
if (scheduler == NULL) {
pr_err("failed to get scheduler, %s(%d)\n", __func__,
__LINE__);
ret = -EINVAL;
return ret;
scheduler = job->scheduler;
if (unlikely(scheduler == NULL)) {
pr_err("failed to get scheduler, %s(%d)\n", __func__, __LINE__);
return -EINVAL;
}
memset(&req, 0x0, sizeof(req));
@@ -2232,7 +2222,7 @@ int rga2_init_reg(struct rga_job *job)
sizeof(job->pre_intr_info));
/* check value if legal */
ret = rga2_check_param(&req);
ret = rga2_check_param(scheduler->data, &req);
if (ret == -EINVAL) {
pr_err("req argument is inval\n");
return ret;

124
drivers/video/rockchip/rga3/rga3_reg_info.c
View File

@@ -10,6 +10,7 @@
#include "rga3_reg_info.h"
#include "rga_common.h"
#include "rga_debugger.h"
#include "rga_hw_config.h"
#define FACTOR_MAX ((int)(2 << 15))
@@ -1721,82 +1722,80 @@ static int rga3_scale_check(const struct rga3_req *req)
return 0;
}
static int rga3_check_param(const struct rga3_req *req)
static int rga3_check_param(const struct rga_hw_data *data, const struct rga3_req *req)
{
if (!((req->render_mode == COLOR_FILL_MODE))) {
if (unlikely((req->win0.src_act_w <= 0) ||
(req->win0.src_act_w > 8176)
|| (req->win0.src_act_h <= 0)
|| (req->win0.src_act_h > 8176)
|| (req->win0.dst_act_w <= 0)
|| (req->win0.dst_act_w > 8128)
|| (req->win0.dst_act_h <= 0)
|| (req->win0.dst_act_h > 8128))) {
pr_err("invalid win0 act sw = %d, sh = %d, dw = %d, dh = %d\n",
req->win0.src_act_w, req->win0.src_act_h,
req->win0.dst_act_w, req->win0.dst_act_h);
return -EINVAL;
}
if (unlikely(rga_hw_out_of_range(&(data->input_range),
req->win0.src_act_w, req->win0.src_act_h) ||
rga_hw_out_of_range(&(data->input_range),
req->win0.dst_act_w, req->win0.dst_act_h) ||
rga_hw_out_of_range(&(data->input_range),
req->win0.src_act_w + req->win0.x_offset,
req->win0.src_act_h + req->win0.y_offset))) {
pr_err("invalid win0, src[w,h] = [%d, %d], dst[w,h] = [%d, %d], off[x,y] = [%d,%d]\n",
req->win0.src_act_w, req->win0.src_act_h,
req->win0.dst_act_w, req->win0.dst_act_h,
req->win0.x_offset, req->win0.y_offset);
return -EINVAL;
}
if (unlikely(req->win0.vir_w * rga_get_pixel_stride_from_format(req->win0.format) >
data->max_byte_stride * 8)) {
pr_err("invalid win0 stride, stride = %d, pixel_stride = %d, max_byte_stride = %d\n",
req->win0.vir_w, rga_get_pixel_stride_from_format(req->win0.format),
data->max_byte_stride);
return -EINVAL;
}
if (unlikely(rga_hw_out_of_range(&(data->output_range),
req->wr.dst_act_w, req->wr.dst_act_h))) {
pr_err("invalid wr, [w,h] = [%d, %d]\n", req->wr.dst_act_w, req->wr.dst_act_h);
return -EINVAL;
}
if (unlikely(req->wr.vir_w * rga_get_pixel_stride_from_format(req->wr.format) >
data->max_byte_stride * 8)) {
pr_err("invalid wr stride, stride = %d, pixel_stride = %d, max_byte_stride = %d\n",
req->wr.vir_w, rga_get_pixel_stride_from_format(req->wr.format),
data->max_byte_stride);
return -EINVAL;
}
if (req->win1.yrgb_addr != 0) {
if (unlikely((req->win1.src_act_w <= 0) ||
(req->win1.src_act_w > 8176)
|| (req->win1.src_act_h <= 0)
|| (req->win1.src_act_h > 8176)
|| (req->win1.dst_act_w <= 0)
|| (req->win1.dst_act_w > 8128)
|| (req->win1.dst_act_h <= 0)
|| (req->win1.dst_act_h > 8128))) {
pr_err("invalid win1 act sw = %d, sh = %d, dw = %d, dh = %d\n",
req->win1.src_act_w, req->win1.src_act_h,
req->win1.dst_act_w, req->win1.dst_act_h);
if (unlikely(rga_hw_out_of_range(&(data->input_range),
req->win1.src_act_w, req->win1.src_act_h) ||
rga_hw_out_of_range(&(data->input_range),
req->win1.dst_act_w, req->win1.dst_act_h) ||
rga_hw_out_of_range(&(data->input_range),
req->win1.src_act_w + req->win1.x_offset,
req->win1.src_act_h + req->win1.y_offset))) {
pr_err("invalid win1, src[w,h] = [%d, %d], dst[w,h] = [%d, %d], off[x,y] = [%d,%d]\n",
req->win1.src_act_w, req->win1.src_act_h,
req->win1.dst_act_w, req->win1.dst_act_h,
req->win1.x_offset, req->win1.y_offset);
return -EINVAL;
}
if (unlikely
((req->win1.vir_w <= 0) || (req->win1.vir_w > 8192 * 2)
|| (req->win1.vir_h <= 0)
|| (req->win1.vir_h > 8192 * 2))) {
pr_err("invalid win1 stride vir_w = %d, vir_h = %d\n",
req->win1.vir_w, req->win1.vir_h);
if (unlikely(req->win1.vir_w * rga_get_pixel_stride_from_format(req->win1.format) >
data->max_byte_stride * 8)) {
pr_err("invalid win1 stride, stride = %d, pixel_stride = %d, max_byte_stride = %d\n",
req->win1.vir_w, rga_get_pixel_stride_from_format(req->win1.format),
data->max_byte_stride);
return -EINVAL;
}
/* warning: rotate mode skip this judge */
if (req->rotate_mode == 0) {
/* check win0 dst size > win1 dst size */
if (unlikely
((req->win1.dst_act_w > req->win0.dst_act_w)
|| (req->win1.dst_act_h > req->win0.dst_act_h))) {
pr_err("invalid win1.dst size = %d x %d\n",
req->win1.dst_act_w, req->win1.dst_act_h);
pr_err("invalid win0.dst size = %d x %d\n",
req->win0.dst_act_w, req->win0.dst_act_h);
if (unlikely((req->win1.dst_act_w > req->win0.dst_act_w) ||
(req->win1.dst_act_h > req->win0.dst_act_h))) {
pr_err("invalid output param win0[w,h] = [%d, %d], win1[w,h] = [%d, %d]\n",
req->win0.dst_act_w, req->win0.dst_act_h,
req->win1.dst_act_w, req->win1.dst_act_h);
return -EINVAL;
}
}
}
if (!((req->render_mode == COLOR_FILL_MODE))) {
if (unlikely
((req->win0.vir_w <= 0) || (req->win0.vir_w > 8192)
|| (req->win0.vir_h <= 0)
|| (req->win0.vir_h > 8192))) {
pr_err("invalid win0 vir_w = %d, vir_h = %d\n",
req->win0.vir_w, req->win0.vir_h);
return -EINVAL;
}
}
if (unlikely
((req->wr.vir_w <= 0) || (req->wr.vir_w > 8192 * 2)
|| (req->wr.vir_h <= 0) || (req->wr.vir_h > 8192 * 2))) {
pr_err("invalid wr vir_w = %d, vir_h = %d\n",
req->wr.vir_w, req->wr.vir_h);
return -EINVAL;
}
if (rga3_scale_check(req) < 0)
return -EINVAL;
@@ -1886,13 +1885,20 @@ int rga3_init_reg(struct rga_job *job)
{
struct rga3_req req;
int ret = 0;
struct rga_scheduler_t *scheduler = NULL;
scheduler = job->scheduler;
if (unlikely(scheduler == NULL)) {
pr_err("failed to get scheduler, %s(%d)\n", __func__, __LINE__);
return -EINVAL;
}
memset(&req, 0x0, sizeof(req));
rga_cmd_to_rga3_cmd(&job->rga_command_base, &req);
/* check value if legal */
ret = rga3_check_param(&req);
ret = rga3_check_param(scheduler->data, &req);
if (ret == -EINVAL) {
pr_err("req argument is inval\n");
return ret;

6
drivers/video/rockchip/rga3/rga_hw_config.c
View File

@@ -8,6 +8,9 @@
#include "rga_hw_config.h"
/* RGA 1Word = 4Byte */
#define WORD_TO_BYTE(w) ((w) * 4)
const uint32_t rga3_input_raster_format[] = {
RGA_FORMAT_RGBA_8888,
RGA_FORMAT_BGRA_8888,
@@ -263,6 +266,7 @@ const struct rga_hw_data rga3_data = {
.max_downscale_factor = 3,
.byte_stride_align = 16,
.max_byte_stride = WORD_TO_BYTE(8192),
.feature = RGA_COLOR_KEY,
.csc_r2y_mode = RGA_MODE_CSC_BT601L | RGA_MODE_CSC_BT601F |
@@ -284,6 +288,7 @@ const struct rga_hw_data rga2e_data = {
.max_downscale_factor = 4,
.byte_stride_align = 4,
.max_byte_stride = WORD_TO_BYTE(8192),
.feature = RGA_COLOR_FILL | RGA_COLOR_PALETTE |
RGA_COLOR_KEY | RGA_ROP_CALCULATE |
@@ -307,6 +312,7 @@ const struct rga_hw_data rga2e_1106_data = {
.max_downscale_factor = 4,
.byte_stride_align = 4,
.max_byte_stride = WORD_TO_BYTE(8192),
.feature = RGA_COLOR_FILL | RGA_COLOR_PALETTE |
RGA_COLOR_KEY | RGA_ROP_CALCULATE |