summaryrefslogtreecommitdiff
path: root/drivers/video/b2r2/b2r2_input_validation.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/b2r2/b2r2_input_validation.c')
-rw-r--r--drivers/video/b2r2/b2r2_input_validation.c98
1 files changed, 49 insertions, 49 deletions
diff --git a/drivers/video/b2r2/b2r2_input_validation.c b/drivers/video/b2r2/b2r2_input_validation.c
index ac8b5728847..c8eb2f7b025 100644
--- a/drivers/video/b2r2/b2r2_input_validation.c
+++ b/drivers/video/b2r2/b2r2_input_validation.c
@@ -32,7 +32,7 @@
static bool is_valid_format(enum b2r2_blt_fmt fmt);
static bool is_valid_bg_format(enum b2r2_blt_fmt fmt);
-static bool is_valid_pitch_for_fmt(struct b2r2_control *cont,
+static bool is_valid_pitch_for_fmt(struct device *dev,
u32 pitch, s32 width, enum b2r2_blt_fmt fmt);
static bool is_aligned_width_for_fmt(s32 width, enum b2r2_blt_fmt fmt);
@@ -40,9 +40,9 @@ static s32 width_2_complete_width(s32 width, enum b2r2_blt_fmt fmt);
static bool is_complete_width_for_fmt(s32 width, enum b2r2_blt_fmt fmt);
static bool is_valid_height_for_fmt(s32 height, enum b2r2_blt_fmt fmt);
-static bool validate_img(struct b2r2_control *cont,
+static bool validate_img(struct device *dev,
struct b2r2_blt_img *img);
-static bool validate_rect(struct b2r2_control *cont,
+static bool validate_rect(struct device *dev,
struct b2r2_blt_rect *rect);
@@ -103,7 +103,7 @@ static bool is_valid_bg_format(enum b2r2_blt_fmt fmt)
}
-static bool is_valid_pitch_for_fmt(struct b2r2_control *cont,
+static bool is_valid_pitch_for_fmt(struct device *dev,
u32 pitch, s32 width, enum b2r2_blt_fmt fmt)
{
s32 complete_width;
@@ -111,7 +111,7 @@ static bool is_valid_pitch_for_fmt(struct b2r2_control *cont,
complete_width = width_2_complete_width(width, fmt);
- pitch_derived_from_width = b2r2_calc_pitch_from_width(cont,
+ pitch_derived_from_width = b2r2_calc_pitch_from_width(dev,
complete_width, fmt);
if (pitch < pitch_derived_from_width)
@@ -263,7 +263,7 @@ static bool is_valid_height_for_fmt(s32 height, enum b2r2_blt_fmt fmt)
return true;
}
-static bool validate_img(struct b2r2_control *cont,
+static bool validate_img(struct device *dev,
struct b2r2_blt_img *img)
{
/*
@@ -276,14 +276,14 @@ static bool validate_img(struct b2r2_control *cont,
s32 img_size;
if (!is_valid_format(img->fmt)) {
- b2r2_log_info(cont->dev, "Validation Error: "
+ b2r2_log_info(dev, "Validation Error: "
"!is_valid_format(img->fmt)\n");
return false;
}
if (img->width < 0 || img->width > max_img_width_height ||
img->height < 0 || img->height > max_img_width_height) {
- b2r2_log_info(cont->dev, "Validation Error: "
+ b2r2_log_info(dev, "Validation Error: "
"img->width < 0 || "
"img->width > max_img_width_height || "
"img->height < 0 || "
@@ -293,7 +293,7 @@ static bool validate_img(struct b2r2_control *cont,
if (b2r2_is_mb_fmt(img->fmt)) {
if (!is_complete_width_for_fmt(img->width, img->fmt)) {
- b2r2_log_info(cont->dev, "Validation Error: "
+ b2r2_log_info(dev, "Validation Error: "
"!is_complete_width_for_fmt(img->width,"
" img->fmt)\n");
return false;
@@ -302,7 +302,7 @@ static bool validate_img(struct b2r2_control *cont,
if (0 == img->pitch &&
(!is_aligned_width_for_fmt(img->width, img->fmt) ||
!is_complete_width_for_fmt(img->width, img->fmt))) {
- b2r2_log_info(cont->dev,
+ b2r2_log_info(dev,
"Validation Error: "
"0 == img->pitch && "
"(!is_aligned_width_for_fmt(img->width,"
@@ -313,24 +313,24 @@ static bool validate_img(struct b2r2_control *cont,
}
if (img->pitch != 0 &&
- !is_valid_pitch_for_fmt(cont, img->pitch, img->width,
+ !is_valid_pitch_for_fmt(dev, img->pitch, img->width,
img->fmt)) {
- b2r2_log_info(cont->dev,
+ b2r2_log_info(dev,
"Validation Error: "
"img->pitch != 0 && "
- "!is_valid_pitch_for_fmt(cont, "
+ "!is_valid_pitch_for_fmt(dev, "
"img->pitch, img->width, img->fmt)\n");
return false;
}
}
if (!is_valid_height_for_fmt(img->width, img->fmt)) {
- b2r2_log_info(cont->dev, "Validation Error: "
+ b2r2_log_info(dev, "Validation Error: "
"!is_valid_height_for_fmt(img->width, img->fmt)\n");
return false;
}
- img_size = b2r2_get_img_size(cont, img);
+ img_size = b2r2_get_img_size(dev, img);
/*
* To keep the entire image inside s32 range.
@@ -338,7 +338,7 @@ static bool validate_img(struct b2r2_control *cont,
if ((B2R2_BLT_PTR_HWMEM_BUF_NAME_OFFSET == img->buf.type ||
B2R2_BLT_PTR_FD_OFFSET == img->buf.type) &&
img->buf.offset > (u32)b2r2_s32_max - (u32)img_size) {
- b2r2_log_info(cont->dev, "Validation Error: "
+ b2r2_log_info(dev, "Validation Error: "
"(B2R2_BLT_PTR_HWMEM_BUF_NAME_OFFSET == "
"img->buf.type || B2R2_BLT_PTR_FD_OFFSET == "
"img->buf.type) && img->buf.offset > "
@@ -349,11 +349,11 @@ static bool validate_img(struct b2r2_control *cont,
return true;
}
-static bool validate_rect(struct b2r2_control *cont,
+static bool validate_rect(struct device *dev,
struct b2r2_blt_rect *rect)
{
if (rect->width < 0 || rect->height < 0) {
- b2r2_log_info(cont->dev, "Validation Error: "
+ b2r2_log_info(dev, "Validation Error: "
"rect->width < 0 || rect->height < 0\n");
return false;
}
@@ -361,7 +361,7 @@ static bool validate_rect(struct b2r2_control *cont,
return true;
}
-bool b2r2_validate_user_req(struct b2r2_control *cont,
+bool b2r2_validate_user_req(struct device *dev,
struct b2r2_blt_req *req)
{
bool is_src_img_used;
@@ -370,7 +370,7 @@ bool b2r2_validate_user_req(struct b2r2_control *cont,
bool is_dst_clip_rect_used;
if (req->size != sizeof(struct b2r2_blt_req)) {
- b2r2_log_err(cont->dev, "Validation Error: "
+ b2r2_log_err(dev, "Validation Error: "
"req->size != sizeof(struct b2r2_blt_req)\n");
return false;
}
@@ -382,31 +382,31 @@ bool b2r2_validate_user_req(struct b2r2_control *cont,
is_dst_clip_rect_used = req->flags & B2R2_BLT_FLAG_DESTINATION_CLIP;
if (is_src_img_used || is_src_mask_used) {
- if (!validate_rect(cont, &req->src_rect)) {
- b2r2_log_info(cont->dev, "Validation Error: "
- "!validate_rect(cont, &req->src_rect)\n");
+ if (!validate_rect(dev, &req->src_rect)) {
+ b2r2_log_info(dev, "Validation Error: "
+ "!validate_rect(dev, &req->src_rect)\n");
return false;
}
}
- if (!validate_rect(cont, &req->dst_rect)) {
- b2r2_log_info(cont->dev, "Validation Error: "
- "!validate_rect(cont, &req->dst_rect)\n");
+ if (!validate_rect(dev, &req->dst_rect)) {
+ b2r2_log_info(dev, "Validation Error: "
+ "!validate_rect(dev, &req->dst_rect)\n");
return false;
}
if (is_bg_img_used) {
- if (!validate_rect(cont, &req->bg_rect)) {
- b2r2_log_info(cont->dev, "Validation Error: "
- "!validate_rect(cont, &req->bg_rect)\n");
+ if (!validate_rect(dev, &req->bg_rect)) {
+ b2r2_log_info(dev, "Validation Error: "
+ "!validate_rect(dev, &req->bg_rect)\n");
return false;
}
}
if (is_dst_clip_rect_used) {
- if (!validate_rect(cont, &req->dst_clip_rect)) {
- b2r2_log_info(cont->dev, "Validation Error: "
- "!validate_rect(cont, &req->dst_clip_rect)\n");
+ if (!validate_rect(dev, &req->dst_clip_rect)) {
+ b2r2_log_info(dev, "Validation Error: "
+ "!validate_rect(dev, &req->dst_clip_rect)\n");
return false;
}
}
@@ -414,9 +414,9 @@ bool b2r2_validate_user_req(struct b2r2_control *cont,
if (is_src_img_used) {
struct b2r2_blt_rect src_img_bounding_rect;
- if (!validate_img(cont, &req->src_img)) {
- b2r2_log_info(cont->dev, "Validation Error: "
- "!validate_img(cont, &req->src_img)\n");
+ if (!validate_img(dev, &req->src_img)) {
+ b2r2_log_info(dev, "Validation Error: "
+ "!validate_img(dev, &req->src_img)\n");
return false;
}
@@ -424,7 +424,7 @@ bool b2r2_validate_user_req(struct b2r2_control *cont,
&src_img_bounding_rect);
if (!b2r2_is_rect_inside_rect(&req->src_rect,
&src_img_bounding_rect)) {
- b2r2_log_info(cont->dev, "Validation Error: "
+ b2r2_log_info(dev, "Validation Error: "
"!b2r2_is_rect_inside_rect(&req->src_rect, "
"&src_img_bounding_rect)\n");
return false;
@@ -434,14 +434,14 @@ bool b2r2_validate_user_req(struct b2r2_control *cont,
if (is_bg_img_used) {
struct b2r2_blt_rect bg_img_bounding_rect;
- if (!validate_img(cont, &req->bg_img)) {
- b2r2_log_info(cont->dev, "Validation Error: "
- "!validate_img(cont, &req->bg_img)\n");
+ if (!validate_img(dev, &req->bg_img)) {
+ b2r2_log_info(dev, "Validation Error: "
+ "!validate_img(dev, &req->bg_img)\n");
return false;
}
if (!is_valid_bg_format(req->bg_img.fmt)) {
- b2r2_log_info(cont->dev, "Validation Error: "
+ b2r2_log_info(dev, "Validation Error: "
"!is_valid_bg_format(req->bg_img->fmt)\n");
return false;
}
@@ -450,7 +450,7 @@ bool b2r2_validate_user_req(struct b2r2_control *cont,
&bg_img_bounding_rect);
if (!b2r2_is_rect_inside_rect(&req->bg_rect,
&bg_img_bounding_rect)) {
- b2r2_log_info(cont->dev, "Validation Error: "
+ b2r2_log_info(dev, "Validation Error: "
"!b2r2_is_rect_inside_rect(&req->bg_rect, "
"&bg_img_bounding_rect)\n");
return false;
@@ -460,9 +460,9 @@ bool b2r2_validate_user_req(struct b2r2_control *cont,
if (is_src_mask_used) {
struct b2r2_blt_rect src_mask_bounding_rect;
- if (!validate_img(cont, &req->src_mask)) {
- b2r2_log_info(cont->dev, "Validation Error: "
- "!validate_img(cont, &req->src_mask)\n");
+ if (!validate_img(dev, &req->src_mask)) {
+ b2r2_log_info(dev, "Validation Error: "
+ "!validate_img(dev, &req->src_mask)\n");
return false;
}
@@ -470,22 +470,22 @@ bool b2r2_validate_user_req(struct b2r2_control *cont,
&src_mask_bounding_rect);
if (!b2r2_is_rect_inside_rect(&req->src_rect,
&src_mask_bounding_rect)) {
- b2r2_log_info(cont->dev, "Validation Error: "
+ b2r2_log_info(dev, "Validation Error: "
"!b2r2_is_rect_inside_rect(&req->src_rect, "
"&src_mask_bounding_rect)\n");
return false;
}
}
- if (!validate_img(cont, &req->dst_img)) {
- b2r2_log_info(cont->dev, "Validation Error: "
- "!validate_img(cont, &req->dst_img)\n");
+ if (!validate_img(dev, &req->dst_img)) {
+ b2r2_log_info(dev, "Validation Error: "
+ "!validate_img(dev, &req->dst_img)\n");
return false;
}
if (is_bg_img_used) {
if (!b2r2_is_rect_gte_rect(&req->bg_rect, &req->dst_rect)) {
- b2r2_log_info(cont->dev, "Validation Error: "
+ b2r2_log_info(dev, "Validation Error: "
"!b2r2_is_rect_gte_rect(&req->bg_rect, "
"&req->dst_rect)\n");
return false;