* [PATCH v5 0/3] Enable JPEG Encoder on RK3566/RK3568 @ 2022-06-12 15:53 Nicolas Frattaroli 2022-06-12 15:53 ` [PATCH v5 2/3] media: hantro: Add support for RK356x encoder Nicolas Frattaroli 2022-09-09 23:10 ` (subset) [PATCH v5 0/3] Enable JPEG Encoder on RK3566/RK3568 Heiko Stuebner 0 siblings, 2 replies; 4+ messages in thread From: Nicolas Frattaroli @ 2022-06-12 15:53 UTC (permalink / raw) To: Philipp Zabel, Rob Herring, Krzysztof Kozlowski, Heiko Stuebner, Peter Geis, Michael Riesch, Liang Chen, Mauro Carvalho Chehab, Greg Kroah-Hartman, Ezequiel Garcia Cc: Nicolas Frattaroli, linux-media, linux-rockchip, devicetree, linux-arm-kernel, linux-kernel, linux-staging Hello, this is v5 of my RK356x JPEG encoder patch set. It enables the Hantro hardware encoder of the RK3566 and RK3568 line of SoCs, with JPEG being the only format the driver currently supports encoding for. The first patch adds a new binding, the rockchip,rk3568-vepu binding, to describe this kind of hardware. The reason for going with a new binding instead of modifying the vpu binding as the previous versions did is that the vpu binding is getting quite long, and Ezequiel Garcia suggested (on IRC) that we could document encoder only instances in their own binding. This makes sense to me, especially considering that RK3588 will have more Hantro instances like this to document. The second patch makes the actual driver changes to support this variant. The third and final patch makes the necessary device tree changes for the rk356x device tree file to add both the node for the encoder and its MMU. The series has been tested on a PINE64 Quartz64 Model A with an RK3566 SoC using GStreamer. Regards, Nicolas Frattaroli Changes in v5: - rename rockchip-vepu.yaml to rockchip,rk3568-vepu.yaml - fix #address-cells/#size-cells in bindings example - fix indentation in bindings example Changes in v4: - bindings: move vepu to its own binding, also add it to MAINTAINERS - driver: rename a stray rk3568_jpeg_enc_codec_ops to rk3568_vepu_codec_ops - devicetree: remove interrupt-names property - rebase onto linux-next Changes in v3: - bindings: change consts to an enum - bindings: add check to make sure devices with a -vepu compatible only have the vepu interrupt Changes in v2: - rename compatible as it's not JPEG only - rename device tree nodes as it's not JPEG only - reword commits as it's not JPEG only - get rid of a whole bunch of redundant struct definitions, as, you guessed it, it's not JPEG only Nicolas Frattaroli (3): media: dt-binding: media: Add rk3568-vepu binding media: hantro: Add support for RK356x encoder arm64: dts: rockchip: Add Hantro encoder node to rk356x .../bindings/media/rockchip,rk3568-vepu.yaml | 69 +++++++++++++++++++ MAINTAINERS | 1 + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 20 ++++++ drivers/staging/media/hantro/hantro_drv.c | 1 + drivers/staging/media/hantro/hantro_hw.h | 1 + .../staging/media/hantro/rockchip_vpu_hw.c | 25 +++++++ 6 files changed, 117 insertions(+) create mode 100644 Documentation/devicetree/bindings/media/rockchip,rk3568-vepu.yaml -- 2.36.1 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v5 2/3] media: hantro: Add support for RK356x encoder 2022-06-12 15:53 [PATCH v5 0/3] Enable JPEG Encoder on RK3566/RK3568 Nicolas Frattaroli @ 2022-06-12 15:53 ` Nicolas Frattaroli 2022-06-23 11:53 ` Ezequiel Garcia 2022-09-09 23:10 ` (subset) [PATCH v5 0/3] Enable JPEG Encoder on RK3566/RK3568 Heiko Stuebner 1 sibling, 1 reply; 4+ messages in thread From: Nicolas Frattaroli @ 2022-06-12 15:53 UTC (permalink / raw) To: Ezequiel Garcia, Philipp Zabel, Mauro Carvalho Chehab, Greg Kroah-Hartman, Heiko Stuebner Cc: Nicolas Frattaroli, linux-media, linux-rockchip, linux-staging, linux-kernel, linux-arm-kernel The RK3566 and RK3568 SoCs come with a small Hantro instance which is solely dedicated to encoding. This patch adds the necessary structs to the Hantro driver to allow the JPEG encoder of it to function. Through some sleuthing through the vendor's MPP source code and after closer inspection of the TRM, it was determined that the hardware likely supports VP8 and H.264 as well. Tested with the following GStreamer command: gst-launch-1.0 videotestsrc ! v4l2jpegenc ! matroskamux ! \ filesink location=foo.mkv Signed-off-by: Nicolas Frattaroli <frattaroli.nicolas@gmail.com> --- drivers/staging/media/hantro/hantro_drv.c | 1 + drivers/staging/media/hantro/hantro_hw.h | 1 + .../staging/media/hantro/rockchip_vpu_hw.c | 25 +++++++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c index ac232b5f7825..1112e8d0c821 100644 --- a/drivers/staging/media/hantro/hantro_drv.c +++ b/drivers/staging/media/hantro/hantro_drv.c @@ -638,6 +638,7 @@ static const struct of_device_id of_hantro_match[] = { { .compatible = "rockchip,rk3288-vpu", .data = &rk3288_vpu_variant, }, { .compatible = "rockchip,rk3328-vpu", .data = &rk3328_vpu_variant, }, { .compatible = "rockchip,rk3399-vpu", .data = &rk3399_vpu_variant, }, + { .compatible = "rockchip,rk3568-vepu", .data = &rk3568_vepu_variant, }, { .compatible = "rockchip,rk3568-vpu", .data = &rk3568_vpu_variant, }, #endif #ifdef CONFIG_VIDEO_HANTRO_IMX8M diff --git a/drivers/staging/media/hantro/hantro_hw.h b/drivers/staging/media/hantro/hantro_hw.h index 52a960f6fa4a..8c7eb5591446 100644 --- a/drivers/staging/media/hantro/hantro_hw.h +++ b/drivers/staging/media/hantro/hantro_hw.h @@ -306,6 +306,7 @@ extern const struct hantro_variant rk3066_vpu_variant; extern const struct hantro_variant rk3288_vpu_variant; extern const struct hantro_variant rk3328_vpu_variant; extern const struct hantro_variant rk3399_vpu_variant; +extern const struct hantro_variant rk3568_vepu_variant; extern const struct hantro_variant rk3568_vpu_variant; extern const struct hantro_variant sama5d4_vdec_variant; extern const struct hantro_variant sunxi_vpu_variant; diff --git a/drivers/staging/media/hantro/rockchip_vpu_hw.c b/drivers/staging/media/hantro/rockchip_vpu_hw.c index fc96501f3bc8..b39813d53e57 100644 --- a/drivers/staging/media/hantro/rockchip_vpu_hw.c +++ b/drivers/staging/media/hantro/rockchip_vpu_hw.c @@ -417,6 +417,14 @@ static const struct hantro_codec_ops rk3399_vpu_codec_ops[] = { }, }; +static const struct hantro_codec_ops rk3568_vepu_codec_ops[] = { + [HANTRO_MODE_JPEG_ENC] = { + .run = rockchip_vpu2_jpeg_enc_run, + .reset = rockchip_vpu2_enc_reset, + .done = rockchip_vpu2_jpeg_enc_done, + }, +}; + /* * VPU variant. */ @@ -439,6 +447,10 @@ static const struct hantro_irq rockchip_vpu2_irqs[] = { { "vdpu", rockchip_vpu2_vdpu_irq }, }; +static const struct hantro_irq rk3568_vepu_irqs[] = { + { "vepu", rockchip_vpu2_vepu_irq }, +}; + static const char * const rk3066_vpu_clk_names[] = { "aclk_vdpu", "hclk_vdpu", "aclk_vepu", "hclk_vepu" @@ -545,6 +557,19 @@ const struct hantro_variant rk3399_vpu_variant = { .num_clocks = ARRAY_SIZE(rockchip_vpu_clk_names) }; +const struct hantro_variant rk3568_vepu_variant = { + .enc_offset = 0x0, + .enc_fmts = rockchip_vpu_enc_fmts, + .num_enc_fmts = ARRAY_SIZE(rockchip_vpu_enc_fmts), + .codec = HANTRO_JPEG_ENCODER, + .codec_ops = rk3568_vepu_codec_ops, + .irqs = rk3568_vepu_irqs, + .num_irqs = ARRAY_SIZE(rk3568_vepu_irqs), + .init = rockchip_vpu_hw_init, + .clk_names = rockchip_vpu_clk_names, + .num_clocks = ARRAY_SIZE(rockchip_vpu_clk_names) +}; + const struct hantro_variant rk3568_vpu_variant = { .dec_offset = 0x400, .dec_fmts = rk3399_vpu_dec_fmts, -- 2.36.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v5 2/3] media: hantro: Add support for RK356x encoder 2022-06-12 15:53 ` [PATCH v5 2/3] media: hantro: Add support for RK356x encoder Nicolas Frattaroli @ 2022-06-23 11:53 ` Ezequiel Garcia 0 siblings, 0 replies; 4+ messages in thread From: Ezequiel Garcia @ 2022-06-23 11:53 UTC (permalink / raw) To: Nicolas Frattaroli Cc: Philipp Zabel, Mauro Carvalho Chehab, Greg Kroah-Hartman, Heiko Stuebner, linux-media, linux-rockchip, linux-staging, linux-kernel, linux-arm-kernel Hi Nicolas, On Sun, Jun 12, 2022 at 05:53:45PM +0200, Nicolas Frattaroli wrote: > The RK3566 and RK3568 SoCs come with a small Hantro instance which is > solely dedicated to encoding. This patch adds the necessary structs to > the Hantro driver to allow the JPEG encoder of it to function. > > Through some sleuthing through the vendor's MPP source code and after > closer inspection of the TRM, it was determined that the hardware likely > supports VP8 and H.264 as well. > > Tested with the following GStreamer command: > > gst-launch-1.0 videotestsrc ! v4l2jpegenc ! matroskamux ! \ > filesink location=foo.mkv > > Signed-off-by: Nicolas Frattaroli <frattaroli.nicolas@gmail.com> Reviewed-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> Thanks, Ezequiel > --- > drivers/staging/media/hantro/hantro_drv.c | 1 + > drivers/staging/media/hantro/hantro_hw.h | 1 + > .../staging/media/hantro/rockchip_vpu_hw.c | 25 +++++++++++++++++++ > 3 files changed, 27 insertions(+) > > diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c > index ac232b5f7825..1112e8d0c821 100644 > --- a/drivers/staging/media/hantro/hantro_drv.c > +++ b/drivers/staging/media/hantro/hantro_drv.c > @@ -638,6 +638,7 @@ static const struct of_device_id of_hantro_match[] = { > { .compatible = "rockchip,rk3288-vpu", .data = &rk3288_vpu_variant, }, > { .compatible = "rockchip,rk3328-vpu", .data = &rk3328_vpu_variant, }, > { .compatible = "rockchip,rk3399-vpu", .data = &rk3399_vpu_variant, }, > + { .compatible = "rockchip,rk3568-vepu", .data = &rk3568_vepu_variant, }, > { .compatible = "rockchip,rk3568-vpu", .data = &rk3568_vpu_variant, }, > #endif > #ifdef CONFIG_VIDEO_HANTRO_IMX8M > diff --git a/drivers/staging/media/hantro/hantro_hw.h b/drivers/staging/media/hantro/hantro_hw.h > index 52a960f6fa4a..8c7eb5591446 100644 > --- a/drivers/staging/media/hantro/hantro_hw.h > +++ b/drivers/staging/media/hantro/hantro_hw.h > @@ -306,6 +306,7 @@ extern const struct hantro_variant rk3066_vpu_variant; > extern const struct hantro_variant rk3288_vpu_variant; > extern const struct hantro_variant rk3328_vpu_variant; > extern const struct hantro_variant rk3399_vpu_variant; > +extern const struct hantro_variant rk3568_vepu_variant; > extern const struct hantro_variant rk3568_vpu_variant; > extern const struct hantro_variant sama5d4_vdec_variant; > extern const struct hantro_variant sunxi_vpu_variant; > diff --git a/drivers/staging/media/hantro/rockchip_vpu_hw.c b/drivers/staging/media/hantro/rockchip_vpu_hw.c > index fc96501f3bc8..b39813d53e57 100644 > --- a/drivers/staging/media/hantro/rockchip_vpu_hw.c > +++ b/drivers/staging/media/hantro/rockchip_vpu_hw.c > @@ -417,6 +417,14 @@ static const struct hantro_codec_ops rk3399_vpu_codec_ops[] = { > }, > }; > > +static const struct hantro_codec_ops rk3568_vepu_codec_ops[] = { > + [HANTRO_MODE_JPEG_ENC] = { > + .run = rockchip_vpu2_jpeg_enc_run, > + .reset = rockchip_vpu2_enc_reset, > + .done = rockchip_vpu2_jpeg_enc_done, > + }, > +}; > + > /* > * VPU variant. > */ > @@ -439,6 +447,10 @@ static const struct hantro_irq rockchip_vpu2_irqs[] = { > { "vdpu", rockchip_vpu2_vdpu_irq }, > }; > > +static const struct hantro_irq rk3568_vepu_irqs[] = { > + { "vepu", rockchip_vpu2_vepu_irq }, > +}; > + > static const char * const rk3066_vpu_clk_names[] = { > "aclk_vdpu", "hclk_vdpu", > "aclk_vepu", "hclk_vepu" > @@ -545,6 +557,19 @@ const struct hantro_variant rk3399_vpu_variant = { > .num_clocks = ARRAY_SIZE(rockchip_vpu_clk_names) > }; > > +const struct hantro_variant rk3568_vepu_variant = { > + .enc_offset = 0x0, > + .enc_fmts = rockchip_vpu_enc_fmts, > + .num_enc_fmts = ARRAY_SIZE(rockchip_vpu_enc_fmts), > + .codec = HANTRO_JPEG_ENCODER, > + .codec_ops = rk3568_vepu_codec_ops, > + .irqs = rk3568_vepu_irqs, > + .num_irqs = ARRAY_SIZE(rk3568_vepu_irqs), > + .init = rockchip_vpu_hw_init, > + .clk_names = rockchip_vpu_clk_names, > + .num_clocks = ARRAY_SIZE(rockchip_vpu_clk_names) > +}; > + > const struct hantro_variant rk3568_vpu_variant = { > .dec_offset = 0x400, > .dec_fmts = rk3399_vpu_dec_fmts, > -- > 2.36.1 > ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: (subset) [PATCH v5 0/3] Enable JPEG Encoder on RK3566/RK3568 2022-06-12 15:53 [PATCH v5 0/3] Enable JPEG Encoder on RK3566/RK3568 Nicolas Frattaroli 2022-06-12 15:53 ` [PATCH v5 2/3] media: hantro: Add support for RK356x encoder Nicolas Frattaroli @ 2022-09-09 23:10 ` Heiko Stuebner 1 sibling, 0 replies; 4+ messages in thread From: Heiko Stuebner @ 2022-09-09 23:10 UTC (permalink / raw) To: Rob Herring, Ezequiel Garcia, Liang Chen, Krzysztof Kozlowski, Greg Kroah-Hartman, Philipp Zabel, Peter Geis, Mauro Carvalho Chehab, Michael Riesch, Nicolas Frattaroli Cc: Heiko Stuebner, linux-kernel, devicetree, linux-media, linux-staging, linux-rockchip, linux-arm-kernel On Sun, 12 Jun 2022 17:53:43 +0200, Nicolas Frattaroli wrote: > this is v5 of my RK356x JPEG encoder patch set. It enables the Hantro > hardware encoder of the RK3566 and RK3568 line of SoCs, with JPEG being > the only format the driver currently supports encoding for. > > The first patch adds a new binding, the rockchip,rk3568-vepu binding, to > describe this kind of hardware. The reason for going with a new binding > instead of modifying the vpu binding as the previous versions did is > that the vpu binding is getting quite long, and Ezequiel Garcia suggested > (on IRC) that we could document encoder only instances in their own > binding. This makes sense to me, especially considering that RK3588 will > have more Hantro instances like this to document. > > [...] Applied, thanks! [3/3] arm64: dts: rockchip: Add Hantro encoder node to rk356x commit: 03d86fb5a56919ccf47e1cc5861bb5452017ab93 Best regards, -- Heiko Stuebner <heiko@sntech.de> ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-09-09 23:11 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-06-12 15:53 [PATCH v5 0/3] Enable JPEG Encoder on RK3566/RK3568 Nicolas Frattaroli 2022-06-12 15:53 ` [PATCH v5 2/3] media: hantro: Add support for RK356x encoder Nicolas Frattaroli 2022-06-23 11:53 ` Ezequiel Garcia 2022-09-09 23:10 ` (subset) [PATCH v5 0/3] Enable JPEG Encoder on RK3566/RK3568 Heiko Stuebner
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox