cc7ab6a6b1
* Attach Meson64 to mainline with a bunch of patches. Tested, but need further work. * Enable DVFS on N2 which sometimes works, sometime doesn't, cleanup * Enable beta targets for Meson64 kernel family * Bump with version
57 lines
1.9 KiB
Diff
57 lines
1.9 KiB
Diff
From e742e121a164f15fb287da07f712d93308477dfc Mon Sep 17 00:00:00 2001
|
|
From: Jonas Karlman <jonas@kwiboo.se>
|
|
Date: Sun, 18 Aug 2019 10:40:31 +0000
|
|
Subject: [PATCH] media: hantro: Enable H264 decoding on RK3399
|
|
|
|
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
|
|
---
|
|
drivers/staging/media/hantro/rk3399_vpu_hw.c | 21 +++++++++++++++++++-
|
|
1 file changed, 20 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/staging/media/hantro/rk3399_vpu_hw.c b/drivers/staging/media/hantro/rk3399_vpu_hw.c
|
|
index 9ac1f2cb6a16..8d62bcd1bd9c 100644
|
|
--- a/drivers/staging/media/hantro/rk3399_vpu_hw.c
|
|
+++ b/drivers/staging/media/hantro/rk3399_vpu_hw.c
|
|
@@ -60,6 +60,19 @@ static const struct hantro_fmt rk3399_vpu_dec_fmts[] = {
|
|
.fourcc = V4L2_PIX_FMT_NV12,
|
|
.codec_mode = HANTRO_MODE_NONE,
|
|
},
|
|
+ {
|
|
+ .fourcc = V4L2_PIX_FMT_H264_SLICE,
|
|
+ .codec_mode = HANTRO_MODE_H264_DEC,
|
|
+ .max_depth = 2,
|
|
+ .frmsize = {
|
|
+ .min_width = 48,
|
|
+ .max_width = 4096,
|
|
+ .step_width = MB_DIM,
|
|
+ .min_height = 48,
|
|
+ .max_height = 2304,
|
|
+ .step_height = MB_DIM,
|
|
+ },
|
|
+ },
|
|
{
|
|
.fourcc = V4L2_PIX_FMT_MPEG2_SLICE,
|
|
.codec_mode = HANTRO_MODE_MPEG2_DEC,
|
|
@@ -161,6 +174,12 @@ static const struct hantro_codec_ops rk3399_vpu_codec_ops[] = {
|
|
.init = hantro_jpeg_enc_init,
|
|
.exit = hantro_jpeg_enc_exit,
|
|
},
|
|
+ [HANTRO_MODE_H264_DEC] = {
|
|
+ .run = rk3399_vpu_h264_dec_run,
|
|
+ .reset = rk3399_vpu_dec_reset,
|
|
+ .init = hantro_h264_dec_init,
|
|
+ .exit = hantro_h264_dec_exit,
|
|
+ },
|
|
[HANTRO_MODE_MPEG2_DEC] = {
|
|
.run = rk3399_vpu_mpeg2_dec_run,
|
|
.reset = rk3399_vpu_dec_reset,
|
|
@@ -196,7 +215,7 @@ const struct hantro_variant rk3399_vpu_variant = {
|
|
.dec_fmts = rk3399_vpu_dec_fmts,
|
|
.num_dec_fmts = ARRAY_SIZE(rk3399_vpu_dec_fmts),
|
|
.codec = HANTRO_JPEG_ENCODER | HANTRO_MPEG2_DECODER |
|
|
- HANTRO_VP8_DECODER,
|
|
+ HANTRO_VP8_DECODER | HANTRO_H264_DECODER,
|
|
.codec_ops = rk3399_vpu_codec_ops,
|
|
.irqs = rk3399_irqs,
|
|
.num_irqs = ARRAY_SIZE(rk3399_irqs),
|