| Message ID | 20190531085523.10892-9-p.zabel@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Rename Rockchip VPU driver to Hantro, add initial i.MX8M support | expand |
On 5/31/19 10:55 AM, Philipp Zabel wrote: > For now this just enables MPEG-2 decoding on the Hantro G1 on i.MX8MQ. > > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> > --- > Changes since v2 [1]: > - Adapted to changes in patches 4 and 5 > > [1] https://patchwork.linuxtv.org/patch/56420/ > --- > drivers/staging/media/hantro/Kconfig | 8 +- > drivers/staging/media/hantro/Makefile | 1 + > drivers/staging/media/hantro/hantro_drv.c | 1 + > drivers/staging/media/hantro/hantro_hw.h | 1 + > drivers/staging/media/hantro/imx8m_vpu_hw.c | 171 ++++++++++++++++++++ > 5 files changed, 178 insertions(+), 4 deletions(-) > create mode 100644 drivers/staging/media/hantro/imx8m_vpu_hw.c > > diff --git a/drivers/staging/media/hantro/Kconfig b/drivers/staging/media/hantro/Kconfig > index 660cca358f04..6fdb72df7bd3 100644 > --- a/drivers/staging/media/hantro/Kconfig > +++ b/drivers/staging/media/hantro/Kconfig > @@ -1,15 +1,15 @@ > # SPDX-License-Identifier: GPL-2.0 > config VIDEO_HANTRO > tristate "Hantro VPU driver" > - depends on ARCH_ROCKCHIP || COMPILE_TEST > + depends on ARCH_MXC || ARCH_ROCKCHIP || COMPILE_TEST > depends on VIDEO_DEV && VIDEO_V4L2 && MEDIA_CONTROLLER > depends on MEDIA_CONTROLLER_REQUEST_API > select VIDEOBUF2_DMA_CONTIG > select VIDEOBUF2_VMALLOC > select V4L2_MEM2MEM_DEV > help > - Support for the Hantro IP based Video Processing Unit present on > - Rockchip SoC, which accelerates video and image encoding and > - decoding. > + Support for the Hantro IP based Video Processing Units present on > + Rockchip and NXP i.MX8M SoCs, which accelerate video and image > + encoding and decoding. > To compile this driver as a module, choose M here: the module > will be called hantro-vpu. > diff --git a/drivers/staging/media/hantro/Makefile b/drivers/staging/media/hantro/Makefile > index 14f17a4e48cb..1dac16af451e 100644 > --- a/drivers/staging/media/hantro/Makefile > +++ b/drivers/staging/media/hantro/Makefile > @@ -9,5 +9,6 @@ hantro-vpu-y += \ > rk3399_vpu_hw.o \ > rk3399_vpu_hw_jpeg_enc.o \ > rk3399_vpu_hw_mpeg2_dec.o \ > + imx8m_vpu_hw.o \ > hantro_jpeg.o \ > hantro_mpeg2.o I'm a bit concerned about how this is organized. As far as I can tell, enabling this driver would compile both rockchip and imx8 code into the same driver. You would expect that only the code for the selected architectures would be compiled in (or all if COMPILE_TEST is set, of course). Can you take a look at this? Regards, Hans
On Mon, 3 Jun 2019 14:45:37 +0200 Hans Verkuil <hverkuil@xs4all.nl> wrote: > On 5/31/19 10:55 AM, Philipp Zabel wrote: > > For now this just enables MPEG-2 decoding on the Hantro G1 on i.MX8MQ. > > > > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> > > --- > > Changes since v2 [1]: > > - Adapted to changes in patches 4 and 5 > > > > [1] https://patchwork.linuxtv.org/patch/56420/ > > --- > > drivers/staging/media/hantro/Kconfig | 8 +- > > drivers/staging/media/hantro/Makefile | 1 + > > drivers/staging/media/hantro/hantro_drv.c | 1 + > > drivers/staging/media/hantro/hantro_hw.h | 1 + > > drivers/staging/media/hantro/imx8m_vpu_hw.c | 171 ++++++++++++++++++++ > > 5 files changed, 178 insertions(+), 4 deletions(-) > > create mode 100644 drivers/staging/media/hantro/imx8m_vpu_hw.c > > > > diff --git a/drivers/staging/media/hantro/Kconfig b/drivers/staging/media/hantro/Kconfig > > index 660cca358f04..6fdb72df7bd3 100644 > > --- a/drivers/staging/media/hantro/Kconfig > > +++ b/drivers/staging/media/hantro/Kconfig > > @@ -1,15 +1,15 @@ > > # SPDX-License-Identifier: GPL-2.0 > > config VIDEO_HANTRO > > tristate "Hantro VPU driver" > > - depends on ARCH_ROCKCHIP || COMPILE_TEST > > + depends on ARCH_MXC || ARCH_ROCKCHIP || COMPILE_TEST > > depends on VIDEO_DEV && VIDEO_V4L2 && MEDIA_CONTROLLER > > depends on MEDIA_CONTROLLER_REQUEST_API > > select VIDEOBUF2_DMA_CONTIG > > select VIDEOBUF2_VMALLOC > > select V4L2_MEM2MEM_DEV > > help > > - Support for the Hantro IP based Video Processing Unit present on > > - Rockchip SoC, which accelerates video and image encoding and > > - decoding. > > + Support for the Hantro IP based Video Processing Units present on > > + Rockchip and NXP i.MX8M SoCs, which accelerate video and image > > + encoding and decoding. > > To compile this driver as a module, choose M here: the module > > will be called hantro-vpu. > > diff --git a/drivers/staging/media/hantro/Makefile b/drivers/staging/media/hantro/Makefile > > index 14f17a4e48cb..1dac16af451e 100644 > > --- a/drivers/staging/media/hantro/Makefile > > +++ b/drivers/staging/media/hantro/Makefile > > @@ -9,5 +9,6 @@ hantro-vpu-y += \ > > rk3399_vpu_hw.o \ > > rk3399_vpu_hw_jpeg_enc.o \ > > rk3399_vpu_hw_mpeg2_dec.o \ > > + imx8m_vpu_hw.o \ > > hantro_jpeg.o \ > > hantro_mpeg2.o > > I'm a bit concerned about how this is organized. As far as I can tell, > enabling this driver would compile both rockchip and imx8 code into the > same driver. You would expect that only the code for the selected > architectures would be compiled in (or all if COMPILE_TEST is set, of course). > > Can you take a look at this? Shouldn't be hard to do: config VIDEO_HANTRO tristate "Hantro VPU driver" ... config VIDEO_HANTRO_ROCKCHIP bool "Rockchip Hantro VPU driver" depends on ARCH_ROCKCHIP || COMPILE_TEST depends on VIDEO_HANTRO ... config VIDEO_HANTRO_IMX8 bool "IMX8 Hantro VPU driver" depends on ARCH_IMX || COMPILE_TEST depends on VIDEO_HANTRO ... hantro-vpu-$(VIDEO_HANTRO_RK3288) += rkxxxx... hantro-vpu-$(VIDEO_HANTRO_IMX8) += imx8... and a couple of #ifdef in rockchip_vpu_drv.c. This being said, I think most of the code in the SoC specific files could be shared if we find a way to abstract the reg layout (using regmap/reg_field?), leaving a small amount of SoC-specific code, so I'm not sure it's a big deal if have support for all SoCs compiled in. What could be a problem though is if each SoC starts pulling its own set of dependencies.
On 6/3/19 10:02 PM, Boris Brezillon wrote: > On Mon, 3 Jun 2019 14:45:37 +0200 > Hans Verkuil <hverkuil@xs4all.nl> wrote: > >> On 5/31/19 10:55 AM, Philipp Zabel wrote: >>> For now this just enables MPEG-2 decoding on the Hantro G1 on i.MX8MQ. >>> >>> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> >>> --- >>> Changes since v2 [1]: >>> - Adapted to changes in patches 4 and 5 >>> >>> [1] https://patchwork.linuxtv.org/patch/56420/ >>> --- >>> drivers/staging/media/hantro/Kconfig | 8 +- >>> drivers/staging/media/hantro/Makefile | 1 + >>> drivers/staging/media/hantro/hantro_drv.c | 1 + >>> drivers/staging/media/hantro/hantro_hw.h | 1 + >>> drivers/staging/media/hantro/imx8m_vpu_hw.c | 171 ++++++++++++++++++++ >>> 5 files changed, 178 insertions(+), 4 deletions(-) >>> create mode 100644 drivers/staging/media/hantro/imx8m_vpu_hw.c >>> >>> diff --git a/drivers/staging/media/hantro/Kconfig b/drivers/staging/media/hantro/Kconfig >>> index 660cca358f04..6fdb72df7bd3 100644 >>> --- a/drivers/staging/media/hantro/Kconfig >>> +++ b/drivers/staging/media/hantro/Kconfig >>> @@ -1,15 +1,15 @@ >>> # SPDX-License-Identifier: GPL-2.0 >>> config VIDEO_HANTRO >>> tristate "Hantro VPU driver" >>> - depends on ARCH_ROCKCHIP || COMPILE_TEST >>> + depends on ARCH_MXC || ARCH_ROCKCHIP || COMPILE_TEST >>> depends on VIDEO_DEV && VIDEO_V4L2 && MEDIA_CONTROLLER >>> depends on MEDIA_CONTROLLER_REQUEST_API >>> select VIDEOBUF2_DMA_CONTIG >>> select VIDEOBUF2_VMALLOC >>> select V4L2_MEM2MEM_DEV >>> help >>> - Support for the Hantro IP based Video Processing Unit present on >>> - Rockchip SoC, which accelerates video and image encoding and >>> - decoding. >>> + Support for the Hantro IP based Video Processing Units present on >>> + Rockchip and NXP i.MX8M SoCs, which accelerate video and image >>> + encoding and decoding. >>> To compile this driver as a module, choose M here: the module >>> will be called hantro-vpu. >>> diff --git a/drivers/staging/media/hantro/Makefile b/drivers/staging/media/hantro/Makefile >>> index 14f17a4e48cb..1dac16af451e 100644 >>> --- a/drivers/staging/media/hantro/Makefile >>> +++ b/drivers/staging/media/hantro/Makefile >>> @@ -9,5 +9,6 @@ hantro-vpu-y += \ >>> rk3399_vpu_hw.o \ >>> rk3399_vpu_hw_jpeg_enc.o \ >>> rk3399_vpu_hw_mpeg2_dec.o \ >>> + imx8m_vpu_hw.o \ >>> hantro_jpeg.o \ >>> hantro_mpeg2.o >> >> I'm a bit concerned about how this is organized. As far as I can tell, >> enabling this driver would compile both rockchip and imx8 code into the >> same driver. You would expect that only the code for the selected >> architectures would be compiled in (or all if COMPILE_TEST is set, of course). >> >> Can you take a look at this? > > Shouldn't be hard to do: > > config VIDEO_HANTRO > tristate "Hantro VPU driver" > ... > > config VIDEO_HANTRO_ROCKCHIP > bool "Rockchip Hantro VPU driver" > depends on ARCH_ROCKCHIP || COMPILE_TEST > depends on VIDEO_HANTRO > ... > > config VIDEO_HANTRO_IMX8 > bool "IMX8 Hantro VPU driver" > depends on ARCH_IMX || COMPILE_TEST > depends on VIDEO_HANTRO > ... > > hantro-vpu-$(VIDEO_HANTRO_RK3288) += rkxxxx... > hantro-vpu-$(VIDEO_HANTRO_IMX8) += imx8... > > and a couple of #ifdef in rockchip_vpu_drv.c. > > This being said, I think most of the code in the SoC specific files > could be shared if we find a way to abstract the reg layout (using > regmap/reg_field?), leaving a small amount of SoC-specific code, so I'm > not sure it's a big deal if have support for all SoCs compiled in. What > could be a problem though is if each SoC starts pulling its own set of > dependencies. > I'd rather we do this right from the start. It's easy enough to implement, and it is cleaner this way. Regards, Hans
On Tue, 2019-06-04 at 12:42 +0200, Hans Verkuil wrote: > On 6/3/19 10:02 PM, Boris Brezillon wrote: > > On Mon, 3 Jun 2019 14:45:37 +0200 > > Hans Verkuil <hverkuil@xs4all.nl> wrote: > > > > > On 5/31/19 10:55 AM, Philipp Zabel wrote: > > > > For now this just enables MPEG-2 decoding on the Hantro G1 on i.MX8MQ. > > > > > > > > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> > > > > --- > > > > Changes since v2 [1]: > > > > - Adapted to changes in patches 4 and 5 > > > > > > > > [1] https://patchwork.linuxtv.org/patch/56420/ > > > > --- > > > > drivers/staging/media/hantro/Kconfig | 8 +- > > > > drivers/staging/media/hantro/Makefile | 1 + > > > > drivers/staging/media/hantro/hantro_drv.c | 1 + > > > > drivers/staging/media/hantro/hantro_hw.h | 1 + > > > > drivers/staging/media/hantro/imx8m_vpu_hw.c | 171 ++++++++++++++++++++ > > > > 5 files changed, 178 insertions(+), 4 deletions(-) > > > > create mode 100644 drivers/staging/media/hantro/imx8m_vpu_hw.c > > > > > > > > diff --git a/drivers/staging/media/hantro/Kconfig b/drivers/staging/media/hantro/Kconfig > > > > index 660cca358f04..6fdb72df7bd3 100644 > > > > --- a/drivers/staging/media/hantro/Kconfig > > > > +++ b/drivers/staging/media/hantro/Kconfig > > > > @@ -1,15 +1,15 @@ > > > > # SPDX-License-Identifier: GPL-2.0 > > > > config VIDEO_HANTRO > > > > tristate "Hantro VPU driver" > > > > - depends on ARCH_ROCKCHIP || COMPILE_TEST > > > > + depends on ARCH_MXC || ARCH_ROCKCHIP || COMPILE_TEST > > > > depends on VIDEO_DEV && VIDEO_V4L2 && MEDIA_CONTROLLER > > > > depends on MEDIA_CONTROLLER_REQUEST_API > > > > select VIDEOBUF2_DMA_CONTIG > > > > select VIDEOBUF2_VMALLOC > > > > select V4L2_MEM2MEM_DEV > > > > help > > > > - Support for the Hantro IP based Video Processing Unit present on > > > > - Rockchip SoC, which accelerates video and image encoding and > > > > - decoding. > > > > + Support for the Hantro IP based Video Processing Units present on > > > > + Rockchip and NXP i.MX8M SoCs, which accelerate video and image > > > > + encoding and decoding. > > > > To compile this driver as a module, choose M here: the module > > > > will be called hantro-vpu. > > > > diff --git a/drivers/staging/media/hantro/Makefile b/drivers/staging/media/hantro/Makefile > > > > index 14f17a4e48cb..1dac16af451e 100644 > > > > --- a/drivers/staging/media/hantro/Makefile > > > > +++ b/drivers/staging/media/hantro/Makefile > > > > @@ -9,5 +9,6 @@ hantro-vpu-y += \ > > > > rk3399_vpu_hw.o \ > > > > rk3399_vpu_hw_jpeg_enc.o \ > > > > rk3399_vpu_hw_mpeg2_dec.o \ > > > > + imx8m_vpu_hw.o \ > > > > hantro_jpeg.o \ > > > > hantro_mpeg2.o > > > > > > I'm a bit concerned about how this is organized. As far as I can tell, > > > enabling this driver would compile both rockchip and imx8 code into the > > > same driver. You would expect that only the code for the selected > > > architectures would be compiled in (or all if COMPILE_TEST is set, of course). > > > > > > Can you take a look at this? > > > > Shouldn't be hard to do: > > > > config VIDEO_HANTRO > > tristate "Hantro VPU driver" > > ... > > > > config VIDEO_HANTRO_ROCKCHIP > > bool "Rockchip Hantro VPU driver" > > depends on ARCH_ROCKCHIP || COMPILE_TEST > > depends on VIDEO_HANTRO > > ... > > > > config VIDEO_HANTRO_IMX8 > > bool "IMX8 Hantro VPU driver" > > depends on ARCH_IMX || COMPILE_TEST > > depends on VIDEO_HANTRO > > ... > > > > hantro-vpu-$(VIDEO_HANTRO_RK3288) += rkxxxx... > > hantro-vpu-$(VIDEO_HANTRO_IMX8) += imx8... > > > > and a couple of #ifdef in rockchip_vpu_drv.c. > > > > This being said, I think most of the code in the SoC specific files > > could be shared if we find a way to abstract the reg layout (using > > regmap/reg_field?), leaving a small amount of SoC-specific code, so I'm > > not sure it's a big deal if have support for all SoCs compiled in. What > > could be a problem though is if each SoC starts pulling its own set of > > dependencies. > > > > I'd rather we do this right from the start. It's easy enough to implement, > and it is cleaner this way. I'm not sure the size difference is worth the additional Kconfig options, but I'll add them and see. regards Philipp
On Tue, Jun 11, 2019 at 7:26 AM Philipp Zabel <p.zabel@pengutronix.de> wrote: > > On Tue, 2019-06-04 at 12:42 +0200, Hans Verkuil wrote: > > On 6/3/19 10:02 PM, Boris Brezillon wrote: > > > On Mon, 3 Jun 2019 14:45:37 +0200 > > > Hans Verkuil <hverkuil@xs4all.nl> wrote: > > > > > > > On 5/31/19 10:55 AM, Philipp Zabel wrote: > > > > > For now this just enables MPEG-2 decoding on the Hantro G1 on i.MX8MQ. > > > > > > > > > > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> > > > > > --- > > > > > Changes since v2 [1]: > > > > > - Adapted to changes in patches 4 and 5 > > > > > > > > > > [1] https://patchwork.linuxtv.org/patch/56420/ > > > > > --- > > > > > drivers/staging/media/hantro/Kconfig | 8 +- > > > > > drivers/staging/media/hantro/Makefile | 1 + > > > > > drivers/staging/media/hantro/hantro_drv.c | 1 + > > > > > drivers/staging/media/hantro/hantro_hw.h | 1 + > > > > > drivers/staging/media/hantro/imx8m_vpu_hw.c | 171 ++++++++++++++++++++ > > > > > 5 files changed, 178 insertions(+), 4 deletions(-) > > > > > create mode 100644 drivers/staging/media/hantro/imx8m_vpu_hw.c > > > > > > > > > > diff --git a/drivers/staging/media/hantro/Kconfig b/drivers/staging/media/hantro/Kconfig > > > > > index 660cca358f04..6fdb72df7bd3 100644 > > > > > --- a/drivers/staging/media/hantro/Kconfig > > > > > +++ b/drivers/staging/media/hantro/Kconfig > > > > > @@ -1,15 +1,15 @@ > > > > > # SPDX-License-Identifier: GPL-2.0 > > > > > config VIDEO_HANTRO > > > > > tristate "Hantro VPU driver" > > > > > - depends on ARCH_ROCKCHIP || COMPILE_TEST > > > > > + depends on ARCH_MXC || ARCH_ROCKCHIP || COMPILE_TEST > > > > > depends on VIDEO_DEV && VIDEO_V4L2 && MEDIA_CONTROLLER > > > > > depends on MEDIA_CONTROLLER_REQUEST_API > > > > > select VIDEOBUF2_DMA_CONTIG > > > > > select VIDEOBUF2_VMALLOC > > > > > select V4L2_MEM2MEM_DEV > > > > > help > > > > > - Support for the Hantro IP based Video Processing Unit present on > > > > > - Rockchip SoC, which accelerates video and image encoding and > > > > > - decoding. > > > > > + Support for the Hantro IP based Video Processing Units present on > > > > > + Rockchip and NXP i.MX8M SoCs, which accelerate video and image > > > > > + encoding and decoding. > > > > > To compile this driver as a module, choose M here: the module > > > > > will be called hantro-vpu. > > > > > diff --git a/drivers/staging/media/hantro/Makefile b/drivers/staging/media/hantro/Makefile > > > > > index 14f17a4e48cb..1dac16af451e 100644 > > > > > --- a/drivers/staging/media/hantro/Makefile > > > > > +++ b/drivers/staging/media/hantro/Makefile > > > > > @@ -9,5 +9,6 @@ hantro-vpu-y += \ > > > > > rk3399_vpu_hw.o \ > > > > > rk3399_vpu_hw_jpeg_enc.o \ > > > > > rk3399_vpu_hw_mpeg2_dec.o \ > > > > > + imx8m_vpu_hw.o \ > > > > > hantro_jpeg.o \ > > > > > hantro_mpeg2.o > > > > > > > > I'm a bit concerned about how this is organized. As far as I can tell, > > > > enabling this driver would compile both rockchip and imx8 code into the > > > > same driver. You would expect that only the code for the selected > > > > architectures would be compiled in (or all if COMPILE_TEST is set, of course). > > > > > > > > Can you take a look at this? > > > > > > Shouldn't be hard to do: > > > > > > config VIDEO_HANTRO > > > tristate "Hantro VPU driver" > > > ... > > > > > > config VIDEO_HANTRO_ROCKCHIP > > > bool "Rockchip Hantro VPU driver" > > > depends on ARCH_ROCKCHIP || COMPILE_TEST > > > depends on VIDEO_HANTRO > > > ... > > > > > > config VIDEO_HANTRO_IMX8 > > > bool "IMX8 Hantro VPU driver" > > > depends on ARCH_IMX || COMPILE_TEST > > > depends on VIDEO_HANTRO > > > ... > > > > > > hantro-vpu-$(VIDEO_HANTRO_RK3288) += rkxxxx... > > > hantro-vpu-$(VIDEO_HANTRO_IMX8) += imx8... > > > > > > and a couple of #ifdef in rockchip_vpu_drv.c. > > > > > > This being said, I think most of the code in the SoC specific files > > > could be shared if we find a way to abstract the reg layout (using > > > regmap/reg_field?), leaving a small amount of SoC-specific code, so I'm > > > not sure it's a big deal if have support for all SoCs compiled in. What > > > could be a problem though is if each SoC starts pulling its own set of > > > dependencies. > > > > > > > I'd rather we do this right from the start. It's easy enough to implement, > > and it is cleaner this way. > > I'm not sure the size difference is worth the additional Kconfig > options, but I'll add them and see. What is the status of this? It would be nice to support the hantro driver on the i.MX8M... family if possible. let me know if I can help in any way. adam > > regards > Philipp
diff --git a/drivers/staging/media/hantro/Kconfig b/drivers/staging/media/hantro/Kconfig index 660cca358f04..6fdb72df7bd3 100644 --- a/drivers/staging/media/hantro/Kconfig +++ b/drivers/staging/media/hantro/Kconfig @@ -1,15 +1,15 @@ # SPDX-License-Identifier: GPL-2.0 config VIDEO_HANTRO tristate "Hantro VPU driver" - depends on ARCH_ROCKCHIP || COMPILE_TEST + depends on ARCH_MXC || ARCH_ROCKCHIP || COMPILE_TEST depends on VIDEO_DEV && VIDEO_V4L2 && MEDIA_CONTROLLER depends on MEDIA_CONTROLLER_REQUEST_API select VIDEOBUF2_DMA_CONTIG select VIDEOBUF2_VMALLOC select V4L2_MEM2MEM_DEV help - Support for the Hantro IP based Video Processing Unit present on - Rockchip SoC, which accelerates video and image encoding and - decoding. + Support for the Hantro IP based Video Processing Units present on + Rockchip and NXP i.MX8M SoCs, which accelerate video and image + encoding and decoding. To compile this driver as a module, choose M here: the module will be called hantro-vpu. diff --git a/drivers/staging/media/hantro/Makefile b/drivers/staging/media/hantro/Makefile index 14f17a4e48cb..1dac16af451e 100644 --- a/drivers/staging/media/hantro/Makefile +++ b/drivers/staging/media/hantro/Makefile @@ -9,5 +9,6 @@ hantro-vpu-y += \ rk3399_vpu_hw.o \ rk3399_vpu_hw_jpeg_enc.o \ rk3399_vpu_hw_mpeg2_dec.o \ + imx8m_vpu_hw.o \ hantro_jpeg.o \ hantro_mpeg2.o diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c index 1f756e06dfc6..bf88e594d440 100644 --- a/drivers/staging/media/hantro/hantro_drv.c +++ b/drivers/staging/media/hantro/hantro_drv.c @@ -418,6 +418,7 @@ static const struct of_device_id of_hantro_match[] = { { .compatible = "rockchip,rk3399-vpu", .data = &rk3399_vpu_variant, }, { .compatible = "rockchip,rk3328-vpu", .data = &rk3328_vpu_variant, }, { .compatible = "rockchip,rk3288-vpu", .data = &rk3288_vpu_variant, }, + { .compatible = "nxp,imx8mq-vpu", .data = &imx8mq_vpu_variant, }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, of_hantro_match); diff --git a/drivers/staging/media/hantro/hantro_hw.h b/drivers/staging/media/hantro/hantro_hw.h index 3c361c2e9b88..fd6ad017a1cf 100644 --- a/drivers/staging/media/hantro/hantro_hw.h +++ b/drivers/staging/media/hantro/hantro_hw.h @@ -81,6 +81,7 @@ enum hantro_enc_fmt { extern const struct hantro_variant rk3399_vpu_variant; extern const struct hantro_variant rk3328_vpu_variant; extern const struct hantro_variant rk3288_vpu_variant; +extern const struct hantro_variant imx8mq_vpu_variant; void hantro_watchdog(struct work_struct *work); void hantro_run(struct hantro_ctx *ctx); diff --git a/drivers/staging/media/hantro/imx8m_vpu_hw.c b/drivers/staging/media/hantro/imx8m_vpu_hw.c new file mode 100644 index 000000000000..3da5cbd1eab1 --- /dev/null +++ b/drivers/staging/media/hantro/imx8m_vpu_hw.c @@ -0,0 +1,171 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Hantro VPU codec driver + * + * Copyright (C) 2019 Pengutronix, Philipp Zabel <kernel@pengutronix.de> + */ + +#include <linux/clk.h> +#include <linux/delay.h> + +#include "hantro.h" +#include "hantro_jpeg.h" +#include "rk3288_vpu_regs.h" + +#define CTRL_SOFT_RESET 0x00 +#define RESET_G1 BIT(1) +#define RESET_G2 BIT(0) + +#define CTRL_CLOCK_ENABLE 0x04 +#define CLOCK_G1 BIT(1) +#define CLOCK_G2 BIT(0) + +#define CTRL_G1_DEC_FUSE 0x08 +#define CTRL_G1_PP_FUSE 0x0c +#define CTRL_G2_DEC_FUSE 0x10 + +static void imx8m_soft_reset(struct hantro_dev *vpu, u32 reset_bits) +{ + u32 val; + + /* Assert */ + val = readl(vpu->ctrl_base + CTRL_SOFT_RESET); + val &= ~reset_bits; + writel(val, vpu->ctrl_base + CTRL_SOFT_RESET); + + udelay(2); + + /* Release */ + val = readl(vpu->ctrl_base + CTRL_SOFT_RESET); + val |= reset_bits; + writel(val, vpu->ctrl_base + CTRL_SOFT_RESET); +} + +static void imx8m_clk_enable(struct hantro_dev *vpu, u32 clock_bits) +{ + u32 val; + + val = readl(vpu->ctrl_base + CTRL_CLOCK_ENABLE); + val |= clock_bits; + writel(val, vpu->ctrl_base + CTRL_CLOCK_ENABLE); +} + +static int imx8mq_runtime_resume(struct hantro_dev *vpu) +{ + int ret; + + ret = clk_bulk_prepare_enable(vpu->variant->num_clocks, vpu->clocks); + if (ret) { + dev_err(vpu->dev, "Failed to enable clocks\n"); + return ret; + } + + imx8m_soft_reset(vpu, RESET_G1 | RESET_G2); + imx8m_clk_enable(vpu, CLOCK_G1 | CLOCK_G2); + + /* Set values of the fuse registers */ + writel(0xffffffff, vpu->ctrl_base + CTRL_G1_DEC_FUSE); + writel(0xffffffff, vpu->ctrl_base + CTRL_G1_PP_FUSE); + writel(0xffffffff, vpu->ctrl_base + CTRL_G2_DEC_FUSE); + + clk_bulk_disable_unprepare(vpu->variant->num_clocks, vpu->clocks); + + return 0; +} + +/* + * Supported formats. + */ + +static const struct hantro_fmt imx8m_vpu_dec_fmts[] = { + { + .fourcc = V4L2_PIX_FMT_NV12, + .codec_mode = HANTRO_MODE_NONE, + }, + { + .fourcc = V4L2_PIX_FMT_MPEG2_SLICE, + .codec_mode = HANTRO_MODE_MPEG2_DEC, + .max_depth = 2, + .frmsize = { + .min_width = 48, + .max_width = 1920, + .step_width = MPEG2_MB_DIM, + .min_height = 48, + .max_height = 1088, + .step_height = MPEG2_MB_DIM, + }, + }, +}; + +static irqreturn_t imx8m_vpu_g1_irq(int irq, void *dev_id) +{ + struct hantro_dev *vpu = dev_id; + enum vb2_buffer_state state; + u32 status; + + status = vdpu_read(vpu, VDPU_REG_INTERRUPT); + state = (status & VDPU_REG_INTERRUPT_DEC_RDY_INT) ? + VB2_BUF_STATE_DONE : VB2_BUF_STATE_ERROR; + + vdpu_write(vpu, 0, VDPU_REG_INTERRUPT); + vdpu_write(vpu, VDPU_REG_CONFIG_DEC_CLK_GATE_E, VDPU_REG_CONFIG); + + hantro_irq_done(vpu, 0, state); + + return IRQ_HANDLED; +} + +static int imx8mq_vpu_hw_init(struct hantro_dev *vpu) +{ + vpu->dec_base = vpu->bases[0]; + vpu->ctrl_base = vpu->bases[vpu->variant->num_regs - 1]; + + return 0; +} + +static void imx8m_vpu_g1_reset(struct hantro_ctx *ctx) +{ + struct hantro_dev *vpu = ctx->dev; + + imx8m_soft_reset(vpu, RESET_G1); +} + +/* + * Supported codec ops. + */ + +static const struct hantro_codec_ops imx8mq_vpu_codec_ops[] = { + [HANTRO_MODE_MPEG2_DEC] = { + .run = hantro_g1_mpeg2_dec_run, + .reset = imx8m_vpu_g1_reset, + .init = hantro_mpeg2_dec_init, + .exit = hantro_mpeg2_dec_exit, + }, +}; + +/* + * VPU variants. + */ + +static const struct hantro_irq imx8mq_irqs[] = { + { "g1", imx8m_vpu_g1_irq }, + { "g2", NULL /* TODO: imx8m_vpu_g2_irq */ }, +}; + +static const char * const imx8mq_reg_names[] = { "g1", "g2", "ctrl" }; + +const struct hantro_variant imx8mq_vpu_variant = { + .dec_fmts = imx8m_vpu_dec_fmts, + .num_dec_fmts = ARRAY_SIZE(imx8m_vpu_dec_fmts), + .codec = HANTRO_MPEG2_DECODER, + .codec_ops = imx8mq_vpu_codec_ops, + .init = imx8mq_vpu_hw_init, + .runtime_resume = imx8mq_runtime_resume, + .irqs = imx8mq_irqs, + .num_irqs = ARRAY_SIZE(imx8mq_irqs), + .num_irqs = 2, + .clk_names = { "g1", "g2", "bus" }, + .num_clocks = 3, + .reg_names = imx8mq_reg_names, + .num_regs = ARRAY_SIZE(imx8mq_reg_names) +};
For now this just enables MPEG-2 decoding on the Hantro G1 on i.MX8MQ. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> --- Changes since v2 [1]: - Adapted to changes in patches 4 and 5 [1] https://patchwork.linuxtv.org/patch/56420/ --- drivers/staging/media/hantro/Kconfig | 8 +- drivers/staging/media/hantro/Makefile | 1 + drivers/staging/media/hantro/hantro_drv.c | 1 + drivers/staging/media/hantro/hantro_hw.h | 1 + drivers/staging/media/hantro/imx8m_vpu_hw.c | 171 ++++++++++++++++++++ 5 files changed, 178 insertions(+), 4 deletions(-) create mode 100644 drivers/staging/media/hantro/imx8m_vpu_hw.c