media: verisilicon: Enable wide 4K in AV1 decoder

Tested on RK3588, this decoder is capable of handling WUHD, so bump the
maximum width and height accordingly.

Reviewed-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

diff --git a/drivers/media/platform/verisilicon/rockchip_vpu_hw.c b/drivers/media/platform/verisilicon/rockchip_vpu_hw.c
index 964122e7c355934cd80eb442219f6ba51bba8b71..b64f0658f7f1e77b3efd960b35cd54dec4edf4ef 100644 (file)
--- a/drivers/media/platform/verisilicon/rockchip_vpu_hw.c
+++ b/drivers/media/platform/verisilicon/rockchip_vpu_hw.c
@@ -85,10 +85,10 @@ static const struct hantro_fmt rockchip_vpu981_postproc_fmts[] = {
                .postprocessed = true,
                .frmsize = {
                        .min_width = ROCKCHIP_VPU981_MIN_SIZE,
-                       .max_width = FMT_UHD_WIDTH,
+                       .max_width = FMT_4K_WIDTH,
                        .step_width = MB_DIM,
                        .min_height = ROCKCHIP_VPU981_MIN_SIZE,
-                       .max_height = FMT_UHD_HEIGHT,
+                       .max_height = FMT_4K_HEIGHT,
                        .step_height = MB_DIM,
                },
        },
@@ -99,10 +99,10 @@ static const struct hantro_fmt rockchip_vpu981_postproc_fmts[] = {
                .postprocessed = true,
                .frmsize = {
                        .min_width = ROCKCHIP_VPU981_MIN_SIZE,
-                       .max_width = FMT_UHD_WIDTH,
+                       .max_width = FMT_4K_WIDTH,
                        .step_width = MB_DIM,
                        .min_height = ROCKCHIP_VPU981_MIN_SIZE,
-                       .max_height = FMT_UHD_HEIGHT,
+                       .max_height = FMT_4K_HEIGHT,
                        .step_height = MB_DIM,
                },
        },
@@ -318,10 +318,10 @@ static const struct hantro_fmt rockchip_vpu981_dec_fmts[] = {
                .match_depth = true,
                .frmsize = {
                        .min_width = ROCKCHIP_VPU981_MIN_SIZE,
-                       .max_width = FMT_UHD_WIDTH,
+                       .max_width = FMT_4K_WIDTH,
                        .step_width = MB_DIM,
                        .min_height = ROCKCHIP_VPU981_MIN_SIZE,
-                       .max_height = FMT_UHD_HEIGHT,
+                       .max_height = FMT_4K_HEIGHT,
                        .step_height = MB_DIM,
                },
        },
@@ -331,10 +331,10 @@ static const struct hantro_fmt rockchip_vpu981_dec_fmts[] = {
                .match_depth = true,
                .frmsize = {
                        .min_width = ROCKCHIP_VPU981_MIN_SIZE,
-                       .max_width = FMT_UHD_WIDTH,
+                       .max_width = FMT_4K_WIDTH,
                        .step_width = MB_DIM,
                        .min_height = ROCKCHIP_VPU981_MIN_SIZE,
-                       .max_height = FMT_UHD_HEIGHT,
+                       .max_height = FMT_4K_HEIGHT,
                        .step_height = MB_DIM,
                },
        },
@@ -344,10 +344,10 @@ static const struct hantro_fmt rockchip_vpu981_dec_fmts[] = {
                .max_depth = 2,
                .frmsize = {
                        .min_width = ROCKCHIP_VPU981_MIN_SIZE,
-                       .max_width = FMT_UHD_WIDTH,
+                       .max_width = FMT_4K_WIDTH,
                        .step_width = MB_DIM,
                        .min_height = ROCKCHIP_VPU981_MIN_SIZE,
-                       .max_height = FMT_UHD_HEIGHT,
+                       .max_height = FMT_4K_HEIGHT,
                        .step_height = MB_DIM,
                },
        },