mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
127 lines
4.2 KiB
Diff
127 lines
4.2 KiB
Diff
From 177d841fa19542eb35aa5ec9579c4abb989c9255 Mon Sep 17 00:00:00 2001
|
|
From: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
|
|
Date: Wed, 29 Jun 2022 20:56:23 +0100
|
|
Subject: [PATCH] media: hantro: Fix RK3399 H.264 format advertising
|
|
|
|
Commit 1f82f2df523cb ("media: hantro: Enable H.264 on Rockchip VDPU2")
|
|
enabled H.264 on some SoCs with VDPU2 cores. This had the side-effect
|
|
of exposing H.264 coded format as supported on RK3399.
|
|
|
|
Fix this and clarify how the codec is explicitly disabled on RK3399 on
|
|
this driver.
|
|
|
|
Fixes: 1f82f2df523cb ("media: hantro: Enable H.264 on Rockchip VDPU2")
|
|
Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
|
|
Tested-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
|
|
Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
|
|
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
|
|
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
|
|
---
|
|
.../staging/media/hantro/rockchip_vpu_hw.c | 60 ++++++++++++++++---
|
|
1 file changed, 53 insertions(+), 7 deletions(-)
|
|
|
|
--- a/drivers/staging/media/hantro/rockchip_vpu_hw.c
|
|
+++ b/drivers/staging/media/hantro/rockchip_vpu_hw.c
|
|
@@ -158,7 +158,7 @@ static const struct hantro_fmt rk3288_vp
|
|
},
|
|
};
|
|
|
|
-static const struct hantro_fmt rk3399_vpu_dec_fmts[] = {
|
|
+static const struct hantro_fmt rockchip_vdpu2_dec_fmts[] = {
|
|
{
|
|
.fourcc = V4L2_PIX_FMT_NV12,
|
|
.codec_mode = HANTRO_MODE_NONE,
|
|
@@ -204,6 +204,47 @@ static const struct hantro_fmt rk3399_vp
|
|
},
|
|
};
|
|
|
|
+static const struct hantro_fmt rk3399_vpu_dec_fmts[] = {
|
|
+ {
|
|
+ .fourcc = V4L2_PIX_FMT_NV12,
|
|
+ .codec_mode = HANTRO_MODE_NONE,
|
|
+ .frmsize = {
|
|
+ .min_width = FMT_MIN_WIDTH,
|
|
+ .max_width = FMT_FHD_WIDTH,
|
|
+ .step_width = MB_DIM,
|
|
+ .min_height = FMT_MIN_HEIGHT,
|
|
+ .max_height = FMT_FHD_HEIGHT,
|
|
+ .step_height = MB_DIM,
|
|
+ },
|
|
+ },
|
|
+ {
|
|
+ .fourcc = V4L2_PIX_FMT_MPEG2_SLICE,
|
|
+ .codec_mode = HANTRO_MODE_MPEG2_DEC,
|
|
+ .max_depth = 2,
|
|
+ .frmsize = {
|
|
+ .min_width = FMT_MIN_WIDTH,
|
|
+ .max_width = FMT_FHD_WIDTH,
|
|
+ .step_width = MB_DIM,
|
|
+ .min_height = FMT_MIN_HEIGHT,
|
|
+ .max_height = FMT_FHD_HEIGHT,
|
|
+ .step_height = MB_DIM,
|
|
+ },
|
|
+ },
|
|
+ {
|
|
+ .fourcc = V4L2_PIX_FMT_VP8_FRAME,
|
|
+ .codec_mode = HANTRO_MODE_VP8_DEC,
|
|
+ .max_depth = 2,
|
|
+ .frmsize = {
|
|
+ .min_width = FMT_MIN_WIDTH,
|
|
+ .max_width = FMT_UHD_WIDTH,
|
|
+ .step_width = MB_DIM,
|
|
+ .min_height = FMT_MIN_HEIGHT,
|
|
+ .max_height = FMT_UHD_HEIGHT,
|
|
+ .step_height = MB_DIM,
|
|
+ },
|
|
+ },
|
|
+};
|
|
+
|
|
static irqreturn_t rockchip_vpu1_vepu_irq(int irq, void *dev_id)
|
|
{
|
|
struct hantro_dev *vpu = dev_id;
|
|
@@ -534,8 +575,8 @@ const struct hantro_variant rk3288_vpu_v
|
|
|
|
const struct hantro_variant rk3328_vpu_variant = {
|
|
.dec_offset = 0x400,
|
|
- .dec_fmts = rk3399_vpu_dec_fmts,
|
|
- .num_dec_fmts = ARRAY_SIZE(rk3399_vpu_dec_fmts),
|
|
+ .dec_fmts = rockchip_vdpu2_dec_fmts,
|
|
+ .num_dec_fmts = ARRAY_SIZE(rockchip_vdpu2_dec_fmts),
|
|
.codec = HANTRO_MPEG2_DECODER | HANTRO_VP8_DECODER |
|
|
HANTRO_H264_DECODER,
|
|
.codec_ops = rk3399_vpu_codec_ops,
|
|
@@ -546,6 +587,11 @@ const struct hantro_variant rk3328_vpu_v
|
|
.num_clocks = ARRAY_SIZE(rockchip_vpu_clk_names),
|
|
};
|
|
|
|
+/*
|
|
+ * H.264 decoding explicitly disabled in RK3399.
|
|
+ * This ensures userspace applications use the Rockchip VDEC core,
|
|
+ * which has better performance.
|
|
+ */
|
|
const struct hantro_variant rk3399_vpu_variant = {
|
|
.enc_offset = 0x0,
|
|
.enc_fmts = rockchip_vpu_enc_fmts,
|
|
@@ -578,8 +624,8 @@ const struct hantro_variant rk3568_vepu_
|
|
|
|
const struct hantro_variant rk3568_vpu_variant = {
|
|
.dec_offset = 0x400,
|
|
- .dec_fmts = rk3399_vpu_dec_fmts,
|
|
- .num_dec_fmts = ARRAY_SIZE(rk3399_vpu_dec_fmts),
|
|
+ .dec_fmts = rockchip_vdpu2_dec_fmts,
|
|
+ .num_dec_fmts = ARRAY_SIZE(rockchip_vdpu2_dec_fmts),
|
|
.codec = HANTRO_MPEG2_DECODER |
|
|
HANTRO_VP8_DECODER | HANTRO_H264_DECODER,
|
|
.codec_ops = rk3399_vpu_codec_ops,
|
|
@@ -595,8 +641,8 @@ const struct hantro_variant px30_vpu_var
|
|
.enc_fmts = rockchip_vpu_enc_fmts,
|
|
.num_enc_fmts = ARRAY_SIZE(rockchip_vpu_enc_fmts),
|
|
.dec_offset = 0x400,
|
|
- .dec_fmts = rk3399_vpu_dec_fmts,
|
|
- .num_dec_fmts = ARRAY_SIZE(rk3399_vpu_dec_fmts),
|
|
+ .dec_fmts = rockchip_vdpu2_dec_fmts,
|
|
+ .num_dec_fmts = ARRAY_SIZE(rockchip_vdpu2_dec_fmts),
|
|
.codec = HANTRO_JPEG_ENCODER | HANTRO_MPEG2_DECODER |
|
|
HANTRO_VP8_DECODER | HANTRO_H264_DECODER,
|
|
.codec_ops = rk3399_vpu_codec_ops,
|