Re: [PATCH 12/12] media: hantro: Add support for the Rockchip PX30

[Alex Bee <knaerzche@xxxxxxxxx>]

Hi Ezequiel,

Am 24.06.21 um 20:26 schrieb Ezequiel Garcia:
> From: Paul Kocialkowski <paul.kocialkowski@xxxxxxxxxxx>
>
> The PX30 SoC includes both the VDPU2 and VEPU2 blocks which are similar
> to the RK3399 (Hantro G1/H1 with shuffled registers).
>
> Signed-off-by: Paul Kocialkowski <paul.kocialkowski@xxxxxxxxxxx>
> Signed-off-by: Ezequiel Garcia <ezequiel@xxxxxxxxxxxxx>
> ---
>   drivers/staging/media/hantro/hantro_drv.c     |  1 +
>   drivers/staging/media/hantro/hantro_hw.h      |  1 +
>   .../staging/media/hantro/rockchip_vpu_hw.c    | 28 +++++++++++++++++++
>   3 files changed, 30 insertions(+)
>
> diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c
> index 9b5415176bfe..8a2edd67f2c6 100644
> --- a/drivers/staging/media/hantro/hantro_drv.c
> +++ b/drivers/staging/media/hantro/hantro_drv.c
> @@ -582,6 +582,7 @@ static const struct v4l2_file_operations hantro_fops = {
>   
>   static const struct of_device_id of_hantro_match[] = {
>   #ifdef CONFIG_VIDEO_HANTRO_ROCKCHIP
> +	{ .compatible = "rockchip,px30-vpu",   .data = &px30_vpu_variant, },
>   	{ .compatible = "rockchip,rk3036-vpu", .data = &rk3036_vpu_variant, },
>   	{ .compatible = "rockchip,rk3066-vpu", .data = &rk3066_vpu_variant, },
>   	{ .compatible = "rockchip,rk3288-vpu", .data = &rk3288_vpu_variant, },
> diff --git a/drivers/staging/media/hantro/hantro_hw.h b/drivers/staging/media/hantro/hantro_hw.h
> index 9296624654a6..df7b5e3a57b9 100644
> --- a/drivers/staging/media/hantro/hantro_hw.h
> +++ b/drivers/staging/media/hantro/hantro_hw.h
> @@ -209,6 +209,7 @@ enum hantro_enc_fmt {
>   
>   extern const struct hantro_variant imx8mq_vpu_g2_variant;
>   extern const struct hantro_variant imx8mq_vpu_variant;
> +extern const struct hantro_variant px30_vpu_variant;
>   extern const struct hantro_variant rk3036_vpu_variant;
>   extern const struct hantro_variant rk3066_vpu_variant;
>   extern const struct hantro_variant rk3288_vpu_variant;
> diff --git a/drivers/staging/media/hantro/rockchip_vpu_hw.c b/drivers/staging/media/hantro/rockchip_vpu_hw.c
> index e4e3b5e7689b..e7f56e30b4a8 100644
> --- a/drivers/staging/media/hantro/rockchip_vpu_hw.c
> +++ b/drivers/staging/media/hantro/rockchip_vpu_hw.c
> @@ -16,6 +16,7 @@
>   
>   #define RK3066_ACLK_MAX_FREQ (300 * 1000 * 1000)
>   #define RK3288_ACLK_MAX_FREQ (400 * 1000 * 1000)
> +#define PX30_ACLK_MAX_FREQ (300 * 1000 * 1000)
>   

Not sure it is required (besides semantics) to introduce a new 
*ACLK_MAX_FREQ here. rk3036_vpu_hw_init could be used to entirely 
replace px30_vpu_hw_init in px30_vpu_variant.

(Maybe we can find some more common names, after we know which variant 
combinations exist)

>   /*
>    * Supported formats.
> @@ -279,6 +280,12 @@ static int rockchip_vpu_hw_init(struct hantro_dev *vpu)
>   	return 0;
>   }
>   
> +static int px30_vpu_hw_init(struct hantro_dev *vpu)
> +{
> +	clk_set_rate(vpu->clocks[0].clk, PX30_ACLK_MAX_FREQ);
> +	return 0;
> +}
> +
>   static void rk3066_vpu_dec_reset(struct hantro_ctx *ctx)
>   {
>   	struct hantro_dev *vpu = ctx->dev;
> @@ -452,6 +459,10 @@ static const char * const rockchip_vpu_clk_names[] = {
>   	"aclk", "hclk"
>   };
>   
> +static const char * const px30_clk_names[] = {
> +	"aclk", "hclk"
> +};
> +
>   /* VDPU1/VEPU1 */
>   
>   const struct hantro_variant rk3036_vpu_variant = {
> @@ -548,3 +559,20 @@ const struct hantro_variant rk3399_vpu_variant = {
>   	.clk_names = rockchip_vpu_clk_names,
>   	.num_clocks = ARRAY_SIZE(rockchip_vpu_clk_names)
>   };
> +
> +const struct hantro_variant px30_vpu_variant = {
> +	.enc_offset = 0x0,
> +	.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),
> +	.codec = HANTRO_JPEG_ENCODER | HANTRO_MPEG2_DECODER |
> +		 HANTRO_VP8_DECODER | HANTRO_H264_DECODER,
> +	.codec_ops = rk3399_vpu_codec_ops,
> +	.irqs = rockchip_vpu2_irqs,
> +	.num_irqs = ARRAY_SIZE(rockchip_vpu2_irqs),
> +	.init = px30_vpu_hw_init,
> +	.clk_names = px30_clk_names,
> +	.num_clocks = ARRAY_SIZE(px30_clk_names)
Better re-use rockchip_vpu_clk_names for these two.
> +};
Alex.