[v6,4/6] media: hantro: Add RK3588 VEPU121

Message ID 20240613135034.31684-5-sebastian.reichel@collabora.com (mailing list archive)
State Superseded
Delegated to: Sebastian Fricke
Headers
Series RK3588 VEPU121/VPU121 support |

Commit Message

Sebastian Reichel June 13, 2024, 1:48 p.m. UTC
  RK3588 handling is exactly the same as RK3568. This is not
handled using fallback compatibles to avoid exposing multiple
video devices on kernels not having the multicore disable
patch.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
 drivers/media/platform/verisilicon/hantro_drv.c | 1 +
 1 file changed, 1 insertion(+)
  

Comments

Jianfeng Liu June 17, 2024, 2:50 a.m. UTC | #1
Hi Sebastian,

Thu, 13 Jun 2024 15:48:45 +0200, Sebastian Reichel wrote:
>+	{ .compatible = "rockchip,rk3588-vepu121", .data = &rk3568_vpu_variant, },

rk3568_vpu_variant is decoder's data, typo?

Regards,
Jianfeng
  
Sebastian Reichel June 17, 2024, 11:30 a.m. UTC | #2
Hi,

On Mon, Jun 17, 2024 at 10:50:22AM GMT, Jianfeng Liu wrote:
> Hi Sebastian,
> 
> Thu, 13 Jun 2024 15:48:45 +0200, Sebastian Reichel wrote:
> >+	{ .compatible = "rockchip,rk3588-vepu121", .data = &rk3568_vpu_variant, },
> 
> rk3568_vpu_variant is decoder's data, typo?

See first sentence of the commit message.

-- Sebastian.
  
Jianfeng Liu June 17, 2024, 3:07 p.m. UTC | #3
Hi,

On Mon, 17 Jun 2024 13:30:52 +0200, Sebastian Reichel wrote:
>> rk3568_vpu_variant is decoder's data, typo?
>
>See first sentence of the commit message.

I know you want a different compatible string for this VEPU121 beacause
of multi cores. But rk3568_vpu_variant is data for VDPU121. I applied this
patch and from output of command:
v4l2-ctl -l -d 3
I see h264/vp8 decoder, which is wrong. vtl2-ctl output of this device
should be JPEG endoer.

Best regards,
Jianfeng
  
Alex Bee June 18, 2024, 8:28 a.m. UTC | #4
Am 17.06.24 um 13:30 schrieb Sebastian Reichel:
> Hi,
> 
> On Mon, Jun 17, 2024 at 10:50:22AM GMT, Jianfeng Liu wrote:
>> Hi Sebastian,
>>
>> Thu, 13 Jun 2024 15:48:45 +0200, Sebastian Reichel wrote:
>>> +	{ .compatible = "rockchip,rk3588-vepu121", .data = &rk3568_vpu_variant, },
>>
>> rk3568_vpu_variant is decoder's data, typo?
> 
> See first sentence of the commit message.
> 
I think, what Jianfeng meant, is that you are incorrectly using
rk3568_vpu_variant for the newly added "rockchip,rk3588-vepu121"
compatible: rk3568_vpu_variant is for the decoder (confusing, I know:
should actually be rk3568_vdpu_variant) - you want to use
rk3568_vepu_variant instead for it instead.

Alex
> -- Sebastian.
> 
> 
> _______________________________________________
> Linux-rockchip mailing list
> Linux-rockchip@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-rockchip
  

Patch

diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c
index 7123479b3eab..b722a20c5fe3 100644
--- a/drivers/media/platform/verisilicon/hantro_drv.c
+++ b/drivers/media/platform/verisilicon/hantro_drv.c
@@ -722,6 +722,7 @@  static const struct of_device_id of_hantro_match[] = {
 	{ .compatible = "rockchip,rk3399-vpu", .data = &rk3399_vpu_variant, },
 	{ .compatible = "rockchip,rk3568-vepu", .data = &rk3568_vepu_variant, },
 	{ .compatible = "rockchip,rk3568-vpu", .data = &rk3568_vpu_variant, },
+	{ .compatible = "rockchip,rk3588-vepu121", .data = &rk3568_vpu_variant, },
 	{ .compatible = "rockchip,rk3588-av1-vpu", .data = &rk3588_vpu981_variant, },
 #endif
 #ifdef CONFIG_VIDEO_HANTRO_IMX8M