From: Ezequiel Garcia <ezequiel@collabora.com> To: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org Cc: Hans Verkuil <hverkuil@xs4all.nl>, Philipp Zabel <p.zabel@pengutronix.de>, Heiko Stuebner <heiko@sntech.de>, Alex Bee <knaerzche@gmail.com>, maccraft123mc@gmail.com, Chris Healy <cphealy@gmail.com>, Paul Kocialkowski <paul.kocialkowski@bootlin.com>, Jernej Skrabec <jernej.skrabec@siol.net>, Jonas Karlman <jonas@kwiboo.se>, Nicolas Dufresne <nicolas.dufresne@collabora.com>, Kever Yang <kever.yang@rock-chips.com>, Ezequiel Garcia <ezequiel@collabora.com>, kernel@collabora.com Subject: [PATCH v2 07/10] media: hantro: Enable H.264 on Rockchip VDPU2 Date: Mon, 28 Jun 2021 09:54:07 -0300 [thread overview] Message-ID: <20210628125410.9228-8-ezequiel@collabora.com> (raw) In-Reply-To: <20210628125410.9228-1-ezequiel@collabora.com> Given H.264 support for VDPU2 was just added, let's enable it. For now, this is only enabled on platform that don't have an RKVDEC core, such as RK3328. Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com> Tested-by: Alex Bee <knaerzche@gmail.com> --- .../staging/media/hantro/rockchip_vpu_hw.c | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/drivers/staging/media/hantro/rockchip_vpu_hw.c b/drivers/staging/media/hantro/rockchip_vpu_hw.c index 3ccc16413f42..e4e3b5e7689b 100644 --- a/drivers/staging/media/hantro/rockchip_vpu_hw.c +++ b/drivers/staging/media/hantro/rockchip_vpu_hw.c @@ -162,6 +162,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 = 1920, + .step_width = MB_DIM, + .min_height = 48, + .max_height = 1088, + .step_height = MB_DIM, + }, + }, { .fourcc = V4L2_PIX_FMT_MPEG2_SLICE, .codec_mode = HANTRO_MODE_MPEG2_DEC, @@ -388,6 +401,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 = rockchip_vpu2_h264_dec_run, + .reset = rockchip_vpu2_dec_reset, + .init = hantro_h264_dec_init, + .exit = hantro_h264_dec_exit, + }, [HANTRO_MODE_MPEG2_DEC] = { .run = rockchip_vpu2_mpeg2_dec_run, .reset = rockchip_vpu2_dec_reset, @@ -433,6 +452,8 @@ static const char * const rockchip_vpu_clk_names[] = { "aclk", "hclk" }; +/* VDPU1/VEPU1 */ + const struct hantro_variant rk3036_vpu_variant = { .dec_offset = 0x400, .dec_fmts = rk3066_vpu_dec_fmts, @@ -495,11 +516,14 @@ const struct hantro_variant rk3288_vpu_variant = { .num_clocks = ARRAY_SIZE(rockchip_vpu_clk_names) }; +/* VDPU2/VEPU2 */ + 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 = rockchip_vdpu2_irqs, .num_irqs = ARRAY_SIZE(rockchip_vdpu2_irqs), -- 2.32.0
WARNING: multiple messages have this Message-ID (diff)
From: Ezequiel Garcia <ezequiel@collabora.com> To: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org Cc: Hans Verkuil <hverkuil@xs4all.nl>, Philipp Zabel <p.zabel@pengutronix.de>, Heiko Stuebner <heiko@sntech.de>, Alex Bee <knaerzche@gmail.com>, maccraft123mc@gmail.com, Chris Healy <cphealy@gmail.com>, Paul Kocialkowski <paul.kocialkowski@bootlin.com>, Jernej Skrabec <jernej.skrabec@siol.net>, Jonas Karlman <jonas@kwiboo.se>, Nicolas Dufresne <nicolas.dufresne@collabora.com>, Kever Yang <kever.yang@rock-chips.com>, Ezequiel Garcia <ezequiel@collabora.com>, kernel@collabora.com Subject: [PATCH v2 07/10] media: hantro: Enable H.264 on Rockchip VDPU2 Date: Mon, 28 Jun 2021 09:54:07 -0300 [thread overview] Message-ID: <20210628125410.9228-8-ezequiel@collabora.com> (raw) In-Reply-To: <20210628125410.9228-1-ezequiel@collabora.com> Given H.264 support for VDPU2 was just added, let's enable it. For now, this is only enabled on platform that don't have an RKVDEC core, such as RK3328. Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com> Tested-by: Alex Bee <knaerzche@gmail.com> --- .../staging/media/hantro/rockchip_vpu_hw.c | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/drivers/staging/media/hantro/rockchip_vpu_hw.c b/drivers/staging/media/hantro/rockchip_vpu_hw.c index 3ccc16413f42..e4e3b5e7689b 100644 --- a/drivers/staging/media/hantro/rockchip_vpu_hw.c +++ b/drivers/staging/media/hantro/rockchip_vpu_hw.c @@ -162,6 +162,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 = 1920, + .step_width = MB_DIM, + .min_height = 48, + .max_height = 1088, + .step_height = MB_DIM, + }, + }, { .fourcc = V4L2_PIX_FMT_MPEG2_SLICE, .codec_mode = HANTRO_MODE_MPEG2_DEC, @@ -388,6 +401,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 = rockchip_vpu2_h264_dec_run, + .reset = rockchip_vpu2_dec_reset, + .init = hantro_h264_dec_init, + .exit = hantro_h264_dec_exit, + }, [HANTRO_MODE_MPEG2_DEC] = { .run = rockchip_vpu2_mpeg2_dec_run, .reset = rockchip_vpu2_dec_reset, @@ -433,6 +452,8 @@ static const char * const rockchip_vpu_clk_names[] = { "aclk", "hclk" }; +/* VDPU1/VEPU1 */ + const struct hantro_variant rk3036_vpu_variant = { .dec_offset = 0x400, .dec_fmts = rk3066_vpu_dec_fmts, @@ -495,11 +516,14 @@ const struct hantro_variant rk3288_vpu_variant = { .num_clocks = ARRAY_SIZE(rockchip_vpu_clk_names) }; +/* VDPU2/VEPU2 */ + 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 = rockchip_vdpu2_irqs, .num_irqs = ARRAY_SIZE(rockchip_vdpu2_irqs), -- 2.32.0 _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip
next prev parent reply other threads:[~2021-06-28 12:55 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-28 12:54 [PATCH v2 00/10] hantro: Enable H.264 VDPU2 Ezequiel Garcia 2021-06-28 12:54 ` Ezequiel Garcia 2021-06-28 12:54 ` [PATCH v2 01/10] hantro: vp8: Move noisy WARN_ON to vpu_debug Ezequiel Garcia 2021-06-28 12:54 ` Ezequiel Garcia 2021-06-28 12:54 ` [PATCH v2 02/10] hantro: Make struct hantro_variant.init() optional Ezequiel Garcia 2021-06-28 12:54 ` Ezequiel Garcia 2021-06-28 12:54 ` [PATCH v2 03/10] media: hantro: Avoid redundant hantro_get_{dst,src}_buf() calls Ezequiel Garcia 2021-06-28 12:54 ` [PATCH v2 03/10] media: hantro: Avoid redundant hantro_get_{dst, src}_buf() calls Ezequiel Garcia 2021-06-28 12:54 ` [PATCH v2 04/10] media: hantro: h264: Move DPB valid and long-term bitmaps Ezequiel Garcia 2021-06-28 12:54 ` Ezequiel Garcia 2021-06-28 12:54 ` [PATCH v2 05/10] media: hantro: h264: Move reference picture number to a helper Ezequiel Garcia 2021-06-28 12:54 ` Ezequiel Garcia 2021-06-28 12:54 ` [PATCH v2 06/10] media: hantro: Add H.264 support for Rockchip VDPU2 Ezequiel Garcia 2021-06-28 12:54 ` Ezequiel Garcia 2021-06-28 12:54 ` Ezequiel Garcia [this message] 2021-06-28 12:54 ` [PATCH v2 07/10] media: hantro: Enable H.264 on " Ezequiel Garcia 2021-06-28 12:54 ` [PATCH v2 08/10] media: hantro: Add support for the Rockchip PX30 Ezequiel Garcia 2021-06-28 12:54 ` Ezequiel Garcia 2021-06-28 12:54 ` [PATCH v2 09/10] dt-bindings: media: rockchip-vpu: Add PX30 compatible Ezequiel Garcia 2021-06-28 12:54 ` Ezequiel Garcia 2021-06-28 12:54 ` [PATCH v2 10/10] arm64: dts: rockchip: Add VPU support for the PX30 Ezequiel Garcia 2021-06-28 12:54 ` Ezequiel Garcia
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210628125410.9228-8-ezequiel@collabora.com \ --to=ezequiel@collabora.com \ --cc=cphealy@gmail.com \ --cc=heiko@sntech.de \ --cc=hverkuil@xs4all.nl \ --cc=jernej.skrabec@siol.net \ --cc=jonas@kwiboo.se \ --cc=kernel@collabora.com \ --cc=kever.yang@rock-chips.com \ --cc=knaerzche@gmail.com \ --cc=linux-media@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=maccraft123mc@gmail.com \ --cc=nicolas.dufresne@collabora.com \ --cc=p.zabel@pengutronix.de \ --cc=paul.kocialkowski@bootlin.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.