[PATCH v3 24/26] media: venus: venc: Make the range of us_per_frame explicit

Ricardo Ribalda posted 26 patches 1 year, 9 months ago
There is a newer version of this series
[PATCH v3 24/26] media: venus: venc: Make the range of us_per_frame explicit
Posted by Ricardo Ribalda 1 year, 9 months ago
Unless the fps is smaller than 0.000232829 fps, this fits in a 32 bit
number. Make that explicit.

Found with cocci:
drivers/media/platform/qcom/venus/venc.c:418:1-7: WARNING: do_div() does a 64-by-32 division, please consider using div64_u64 instead.

Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
---
 drivers/media/platform/qcom/venus/venc.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
index 3ec2fb8d9fab..f87e33a34610 100644
--- a/drivers/media/platform/qcom/venus/venc.c
+++ b/drivers/media/platform/qcom/venus/venc.c
@@ -393,7 +393,7 @@ static int venc_s_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
 	struct venus_inst *inst = to_inst(file);
 	struct v4l2_outputparm *out = &a->parm.output;
 	struct v4l2_fract *timeperframe = &out->timeperframe;
-	u64 us_per_frame, fps;
+	u64 us_per_frame;
 
 	if (a->type != V4L2_BUF_TYPE_VIDEO_OUTPUT &&
 	    a->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
@@ -414,11 +414,8 @@ static int venc_s_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
 	if (!us_per_frame)
 		return -EINVAL;
 
-	fps = (u64)USEC_PER_SEC;
-	do_div(fps, us_per_frame);
-
+	inst->fps = USEC_PER_SEC / (u32)us_per_frame;
 	inst->timeperframe = *timeperframe;
-	inst->fps = fps;
 
 	return 0;
 }

-- 
2.44.0.769.g3c40516874-goog
Re: [PATCH v3 24/26] media: venus: venc: Make the range of us_per_frame explicit
Posted by Ricardo Ribalda 1 year, 2 months ago
Stanimir :

Ping!
(also for https://patchwork.linuxtv.org/project/linux-media/patch/20240429-fix-cocci-v3-23-3c4865f5a4b0@chromium.org/
)

Thanks!

On Mon, 29 Apr 2024 at 17:05, Ricardo Ribalda <ribalda@chromium.org> wrote:
>
> Unless the fps is smaller than 0.000232829 fps, this fits in a 32 bit
> number. Make that explicit.
>
> Found with cocci:
> drivers/media/platform/qcom/venus/venc.c:418:1-7: WARNING: do_div() does a 64-by-32 division, please consider using div64_u64 instead.
>
> Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
> ---
>  drivers/media/platform/qcom/venus/venc.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
> index 3ec2fb8d9fab..f87e33a34610 100644
> --- a/drivers/media/platform/qcom/venus/venc.c
> +++ b/drivers/media/platform/qcom/venus/venc.c
> @@ -393,7 +393,7 @@ static int venc_s_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
>         struct venus_inst *inst = to_inst(file);
>         struct v4l2_outputparm *out = &a->parm.output;
>         struct v4l2_fract *timeperframe = &out->timeperframe;
> -       u64 us_per_frame, fps;
> +       u64 us_per_frame;
>
>         if (a->type != V4L2_BUF_TYPE_VIDEO_OUTPUT &&
>             a->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
> @@ -414,11 +414,8 @@ static int venc_s_parm(struct file *file, void *fh, struct v4l2_streamparm *a)
>         if (!us_per_frame)
>                 return -EINVAL;
>
> -       fps = (u64)USEC_PER_SEC;
> -       do_div(fps, us_per_frame);
> -
> +       inst->fps = USEC_PER_SEC / (u32)us_per_frame;
>         inst->timeperframe = *timeperframe;
> -       inst->fps = fps;
>
>         return 0;
>  }
>
> --
> 2.44.0.769.g3c40516874-goog
>


-- 
Ricardo Ribalda