Re: [PATCH v2 00/12] Add support for older Rockchip SoCs to V4L2 hantro and rkvdec drivers

From: Hans Verkuil <hverkuil@xs4all.nl>
To: Alex Bee <knaerzche@gmail.com>,
	Ezequiel Garcia <ezequiel@collabora.com>,
	Mauro Carvalho Chehab <mchehab@kernel.org>,
	Rob Herring <robh+dt@kernel.org>,
	Heiko Stuebner <heiko@sntech.de>,
	Philipp Zabel <p.zabel@pengutronix.de>,
	Lee Jones <lee.jones@linaro.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org,
	devicetree@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 00/12] Add support for older Rockchip SoCs to V4L2 hantro and rkvdec drivers
Date: Mon, 14 Jun 2021 13:09:38 +0200	[thread overview]
Message-ID: <562d80eb-92e5-53ff-0a15-182cc7676063@xs4all.nl> (raw)
In-Reply-To: <20210527154455.358869-1-knaerzche@gmail.com>

Hi Alex,

On 27/05/2021 17:44, Alex Bee wrote:
> Hi list,
> 
> this series adds support for older Rockchip SoCs (RK3036, RK3066, RK3188
> and RK322x) to the existing V4L2 video decoder/-encoder drivers - namely
> hantro and rkvdec.
> They can be used as-is or with very little modifications.
> 
> In preparation to that patches 1,8 and 9 add power-controller support for
> RK3036 and RK322x, since both drivers rely on pm. The drivers for them 
> exist already in the common Rockchip pm driver, they just haven't be added
> to the device trees yet.
> 
> Changes in v2:
> - reordered patches as suggested by Heiko
> - fixed indentation and order issues in dt-bindings / DT patches
> - added patch to reorder variants in hantro alphanumeric
> - added patch that merges hantro platform drivers for Rockchip in one
> - added missing DT patch for RK3036 (missed to submit with v1)
> See individual patches for details about changes.
> 
> Thanks for your feedback,
> Alex.
> 
> Alex Bee (12):
>   dt-bindings: mfd: syscon: add Rockchip RK3036/RK3228 qos compatibles
>   dt-bindings: media: rockchip-vpu: add new compatibles
>   dt-bindings: media: rockchip-vdec: add RK3228 compatible
>   media: hantro: reorder variants
>   media: hantro: merge Rockchip platform drivers
>   media: hantro: add support for Rockchip RK3066
>   media: hantro: add support for Rockchip RK3036
>   ARM: dts: rockchip: add power controller for RK3036
>   ARM: dts: rockchip: add power controller for RK322x
>   ARM: dts: rockchip: add vpu node for RK3036
>   ARM: dts: rockchip: add vpu nodes for RK3066 and RK3188
>   ARM: dts: rockchip: add vpu and vdec node for RK322x

Unfortunately this series no longer applies. Support for the G2/HEVC decoder
was merged, and that conflicts with this series.

It is best to rebase you series to the master branch of the media_stage
tree (https://git.linuxtv.org/media_stage.git/log/), which contains that
series. I expect/hope that this will be merged later this week to the
regular media_tree master branch, so you can wait for that as well.

Regards,

	Hans

> 
>  .../bindings/media/rockchip,vdec.yaml         |  10 +-
>  .../bindings/media/rockchip-vpu.yaml          |  33 +-
>  .../devicetree/bindings/mfd/syscon.yaml       |   2 +
>  arch/arm/boot/dts/rk3036.dtsi                 |  72 +++
>  arch/arm/boot/dts/rk3066a.dtsi                |   4 +
>  arch/arm/boot/dts/rk3188.dtsi                 |   5 +
>  arch/arm/boot/dts/rk322x.dtsi                 | 140 ++++-
>  arch/arm/boot/dts/rk3xxx.dtsi                 |  12 +
>  drivers/staging/media/hantro/Makefile         |   9 +-
>  drivers/staging/media/hantro/hantro_drv.c     |   6 +-
>  drivers/staging/media/hantro/hantro_hw.h      |  30 +-
>  drivers/staging/media/hantro/rk3288_vpu_hw.c  | 208 -------
>  drivers/staging/media/hantro/rk3399_vpu_hw.c  | 222 --------
>  ...jpeg_enc.c => rockchip_vpu2_hw_jpeg_enc.c} |  30 +-
>  ...eg2_dec.c => rockchip_vpu2_hw_mpeg2_dec.c} |  25 +-
>  ...w_vp8_dec.c => rockchip_vpu2_hw_vp8_dec.c} |   2 +-
>  ...rk3399_vpu_regs.h => rockchip_vpu2_regs.h} |   6 +-
>  .../staging/media/hantro/rockchip_vpu_hw.c    | 526 ++++++++++++++++++
>  18 files changed, 848 insertions(+), 494 deletions(-)
>  delete mode 100644 drivers/staging/media/hantro/rk3288_vpu_hw.c
>  delete mode 100644 drivers/staging/media/hantro/rk3399_vpu_hw.c
>  rename drivers/staging/media/hantro/{rk3399_vpu_hw_jpeg_enc.c => rockchip_vpu2_hw_jpeg_enc.c} (87%)
>  rename drivers/staging/media/hantro/{rk3399_vpu_hw_mpeg2_dec.c => rockchip_vpu2_hw_mpeg2_dec.c} (93%)
>  rename drivers/staging/media/hantro/{rk3399_vpu_hw_vp8_dec.c => rockchip_vpu2_hw_vp8_dec.c} (99%)
>  rename drivers/staging/media/hantro/{rk3399_vpu_regs.h => rockchip_vpu2_regs.h} (99%)
>  create mode 100644 drivers/staging/media/hantro/rockchip_vpu_hw.c
> 
> 
> base-commit: 5d765451c2409e63563fa6a3e8005bd03ab9e82f
> 