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
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
From c2b2a7444f8721119cf4679cb5f1527f193c2dfc 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 RK3328
|
|
|
|
RK3328 SoC has the same decoder IP block as RK3399,
|
|
lets enable H264 decoding on RK3328.
|
|
|
|
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
|
|
---
|
|
drivers/staging/media/hantro/rk3399_vpu_hw.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/staging/media/hantro/rk3399_vpu_hw.c b/drivers/staging/media/hantro/rk3399_vpu_hw.c
|
|
index 8d62bcd1bd9c..9a52ed3f779d 100644
|
|
--- a/drivers/staging/media/hantro/rk3399_vpu_hw.c
|
|
+++ b/drivers/staging/media/hantro/rk3399_vpu_hw.c
|
|
@@ -232,7 +232,8 @@ 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),
|
|
- .codec = HANTRO_MPEG2_DECODER | HANTRO_VP8_DECODER,
|
|
+ .codec = HANTRO_MPEG2_DECODER | HANTRO_VP8_DECODER |
|
|
+ HANTRO_H264_DECODER,
|
|
.codec_ops = rk3399_vpu_codec_ops,
|
|
.irqs = rk3328_irqs,
|
|
.num_irqs = ARRAY_SIZE(rk3328_irqs),
|