* [PATCH] media: rkvdec: use DIV_ROUND_UP() for CTB counts
@ 2026-07-12 7:26 Hiroki Nakajima
2026-07-16 2:26 ` Nicolas Dufresne
0 siblings, 1 reply; 2+ messages in thread
From: Hiroki Nakajima @ 2026-07-12 7:26 UTC (permalink / raw)
To: detlev.casanova, ezequiel
Cc: mchehab, heiko, linux-media, linux-rockchip, linux-arm-kernel,
linux-kernel, Hiroki Nakajima
Use DIV_ROUND_UP() when computing HEVC coding tree block counts
instead of open-coding the same rounding expression. This keeps the
rounding intent explicit without changing behavior.
Found using a Coccinelle rule generated from the DIV_ROUND_UP() macro
definition.
Signed-off-by: Hiroki Nakajima <3na7nanana@gmail.com>
---
drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c | 4 ++--
.../media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c | 8 ++++----
.../media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c
index 87abf93dfd5e..ff3942f91c5d 100644
--- a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c
+++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c
@@ -258,9 +258,9 @@ static void assemble_hw_pps(struct rkvdec_ctx *ctx,
for (i = 0; i <= pps->num_tile_rows_minus1; i++)
WRITE_PPS(pps->row_height_minus1[i], ROW_HEIGHT(i));
} else {
- WRITE_PPS(((sps->pic_width_in_luma_samples + ctb_size_y - 1) / ctb_size_y) - 1,
+ WRITE_PPS(DIV_ROUND_UP(sps->pic_width_in_luma_samples, ctb_size_y) - 1,
COLUMN_WIDTH(0));
- WRITE_PPS(((sps->pic_height_in_luma_samples + ctb_size_y - 1) / ctb_size_y) - 1,
+ WRITE_PPS(DIV_ROUND_UP(sps->pic_height_in_luma_samples, ctb_size_y) - 1,
ROW_HEIGHT(0));
}
diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c
index fe6414a17551..d07c74679552 100644
--- a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c
+++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c
@@ -261,8 +261,8 @@ static void assemble_hw_pps(struct rkvdec_ctx *ctx,
memset(row_height, 0, sizeof(row_height));
max_cu_width = 1 << (sps->log2_diff_max_min_luma_coding_block_size + log2_min_cb_size);
- pic_in_cts_width = (width + max_cu_width - 1) / max_cu_width;
- pic_in_cts_height = (height + max_cu_width - 1) / max_cu_width;
+ pic_in_cts_width = DIV_ROUND_UP(width, max_cu_width);
+ pic_in_cts_height = DIV_ROUND_UP(height, max_cu_width);
if (pps->flags & V4L2_HEVC_PPS_FLAG_TILES_ENABLED) {
if (pps->flags & V4L2_HEVC_PPS_FLAG_UNIFORM_SPACING) {
@@ -275,8 +275,8 @@ static void assemble_hw_pps(struct rkvdec_ctx *ctx,
column_width, row_height);
}
} else {
- column_width[0] = (width + max_cu_width - 1) / max_cu_width;
- row_height[0] = (height + max_cu_width - 1) / max_cu_width;
+ column_width[0] = DIV_ROUND_UP(width, max_cu_width);
+ row_height[0] = DIV_ROUND_UP(height, max_cu_width);
}
for (i = 0; i < 20; i++) {
diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c
index 3575338a531a..3462d995d4cf 100644
--- a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c
+++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c
@@ -287,8 +287,8 @@ static void assemble_hw_pps(struct rkvdec_ctx *ctx,
memset(row_height, 0, sizeof(row_height));
max_cu_width = 1 << (sps->log2_diff_max_min_luma_coding_block_size + log2_min_cb_size);
- pic_in_cts_width = (width + max_cu_width - 1) / max_cu_width;
- pic_in_cts_height = (height + max_cu_width - 1) / max_cu_width;
+ pic_in_cts_width = DIV_ROUND_UP(width, max_cu_width);
+ pic_in_cts_height = DIV_ROUND_UP(height, max_cu_width);
if (tiles_enabled) {
if (pps->flags & V4L2_HEVC_PPS_FLAG_UNIFORM_SPACING) {
@@ -301,8 +301,8 @@ static void assemble_hw_pps(struct rkvdec_ctx *ctx,
column_width, row_height);
}
} else {
- column_width[0] = (width + max_cu_width - 1) / max_cu_width;
- row_height[0] = (height + max_cu_width - 1) / max_cu_width;
+ column_width[0] = DIV_ROUND_UP(width, max_cu_width);
+ row_height[0] = DIV_ROUND_UP(height, max_cu_width);
}
for (i = 0; i < 20; i++)
--
2.34.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] media: rkvdec: use DIV_ROUND_UP() for CTB counts
2026-07-12 7:26 [PATCH] media: rkvdec: use DIV_ROUND_UP() for CTB counts Hiroki Nakajima
@ 2026-07-16 2:26 ` Nicolas Dufresne
0 siblings, 0 replies; 2+ messages in thread
From: Nicolas Dufresne @ 2026-07-16 2:26 UTC (permalink / raw)
To: Hiroki Nakajima, detlev.casanova, ezequiel
Cc: mchehab, heiko, linux-media, linux-rockchip, linux-arm-kernel,
linux-kernel
[-- Attachment #1: Type: text/plain, Size: 4410 bytes --]
Le dimanche 12 juillet 2026 à 16:26 +0900, Hiroki Nakajima a écrit :
> Use DIV_ROUND_UP() when computing HEVC coding tree block counts
> instead of open-coding the same rounding expression. This keeps the
> rounding intent explicit without changing behavior.
>
> Found using a Coccinelle rule generated from the DIV_ROUND_UP() macro
> definition.
>
> Signed-off-by: Hiroki Nakajima <3na7nanana@gmail.com>
Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
> ---
> drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c | 4 ++--
> .../media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c | 8 ++++----
> .../media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c | 8 ++++----
> 3 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c
> b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c
> index 87abf93dfd5e..ff3942f91c5d 100644
> --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c
> +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-hevc.c
> @@ -258,9 +258,9 @@ static void assemble_hw_pps(struct rkvdec_ctx *ctx,
> for (i = 0; i <= pps->num_tile_rows_minus1; i++)
> WRITE_PPS(pps->row_height_minus1[i], ROW_HEIGHT(i));
> } else {
> - WRITE_PPS(((sps->pic_width_in_luma_samples + ctb_size_y - 1)
> / ctb_size_y) - 1,
> + WRITE_PPS(DIV_ROUND_UP(sps->pic_width_in_luma_samples,
> ctb_size_y) - 1,
> COLUMN_WIDTH(0));
> - WRITE_PPS(((sps->pic_height_in_luma_samples + ctb_size_y - 1)
> / ctb_size_y) - 1,
> + WRITE_PPS(DIV_ROUND_UP(sps->pic_height_in_luma_samples,
> ctb_size_y) - 1,
> ROW_HEIGHT(0));
> }
>
> diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c
> b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c
> index fe6414a17551..d07c74679552 100644
> --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c
> +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c
> @@ -261,8 +261,8 @@ static void assemble_hw_pps(struct rkvdec_ctx *ctx,
> memset(row_height, 0, sizeof(row_height));
>
> max_cu_width = 1 << (sps->log2_diff_max_min_luma_coding_block_size +
> log2_min_cb_size);
> - pic_in_cts_width = (width + max_cu_width - 1) / max_cu_width;
> - pic_in_cts_height = (height + max_cu_width - 1) / max_cu_width;
> + pic_in_cts_width = DIV_ROUND_UP(width, max_cu_width);
> + pic_in_cts_height = DIV_ROUND_UP(height, max_cu_width);
>
> if (pps->flags & V4L2_HEVC_PPS_FLAG_TILES_ENABLED) {
> if (pps->flags & V4L2_HEVC_PPS_FLAG_UNIFORM_SPACING) {
> @@ -275,8 +275,8 @@ static void assemble_hw_pps(struct rkvdec_ctx *ctx,
> column_width, row_height);
> }
> } else {
> - column_width[0] = (width + max_cu_width - 1) / max_cu_width;
> - row_height[0] = (height + max_cu_width - 1) / max_cu_width;
> + column_width[0] = DIV_ROUND_UP(width, max_cu_width);
> + row_height[0] = DIV_ROUND_UP(height, max_cu_width);
> }
>
> for (i = 0; i < 20; i++) {
> diff --git a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c
> b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c
> index 3575338a531a..3462d995d4cf 100644
> --- a/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c
> +++ b/drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c
> @@ -287,8 +287,8 @@ static void assemble_hw_pps(struct rkvdec_ctx *ctx,
> memset(row_height, 0, sizeof(row_height));
>
> max_cu_width = 1 << (sps->log2_diff_max_min_luma_coding_block_size +
> log2_min_cb_size);
> - pic_in_cts_width = (width + max_cu_width - 1) / max_cu_width;
> - pic_in_cts_height = (height + max_cu_width - 1) / max_cu_width;
> + pic_in_cts_width = DIV_ROUND_UP(width, max_cu_width);
> + pic_in_cts_height = DIV_ROUND_UP(height, max_cu_width);
>
> if (tiles_enabled) {
> if (pps->flags & V4L2_HEVC_PPS_FLAG_UNIFORM_SPACING) {
> @@ -301,8 +301,8 @@ static void assemble_hw_pps(struct rkvdec_ctx *ctx,
> column_width, row_height);
> }
> } else {
> - column_width[0] = (width + max_cu_width - 1) / max_cu_width;
> - row_height[0] = (height + max_cu_width - 1) / max_cu_width;
> + column_width[0] = DIV_ROUND_UP(width, max_cu_width);
> + row_height[0] = DIV_ROUND_UP(height, max_cu_width);
> }
>
> for (i = 0; i < 20; i++)
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-07-16 2:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-12 7:26 [PATCH] media: rkvdec: use DIV_ROUND_UP() for CTB counts Hiroki Nakajima
2026-07-16 2:26 ` Nicolas Dufresne
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox