media: destage Hantro VPU driver

The Hantro mainline driver has been used in production since several years and was only kept as a staging driver due the stateless CODEC controls. Now that all the stateless CODEC controls have been moved out of staging, graduate the driver as well. Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
openrisc · Aug 31, 2022 · fbb6c84 · fbb6c84
1 parent 61890cc
commit fbb6c84
Show file tree

Hide file tree

Showing 42 changed files with 8 additions and 7 deletions.
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -8904,7 +8904,7 @@ S:	Maintained
 F:	Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
 F:	Documentation/devicetree/bindings/media/rockchip,rk3568-vepu.yaml
 F:	Documentation/devicetree/bindings/media/rockchip-vpu.yaml
-F:	drivers/staging/media/hantro/
+F:	drivers/media/platform/verisilicon/
 
 HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
 M:	Frank Seidel <frank@f-seidel.de>

diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
@@ -81,6 +81,7 @@ source "drivers/media/platform/samsung/Kconfig"
 source "drivers/media/platform/st/Kconfig"
 source "drivers/media/platform/sunxi/Kconfig"
 source "drivers/media/platform/ti/Kconfig"
+source "drivers/media/platform/verisilicon/Kconfig"
 source "drivers/media/platform/via/Kconfig"
 source "drivers/media/platform/xilinx/Kconfig"
 

diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
@@ -24,6 +24,7 @@ obj-y += samsung/
 obj-y += st/
 obj-y += sunxi/
 obj-y += ti/
+obj-y += verisilicon/
 obj-y += via/
 obj-y += xilinx/
 

diff --git a/drivers/staging/media/hantro/Kconfig → drivers/media/platform/verisilicon/Kconfig b/drivers/staging/media/hantro/Kconfig → drivers/media/platform/verisilicon/Kconfig
@@ -1,7 +1,11 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: GPL-2.0-only
+
+comment "Verisilicon media platform drivers"
+
 config VIDEO_HANTRO
 	tristate "Hantro VPU driver"
 	depends on ARCH_MXC || ARCH_ROCKCHIP || ARCH_AT91 || ARCH_SUNXI || COMPILE_TEST
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on VIDEO_DEV
 	select MEDIA_CONTROLLER
 	select MEDIA_CONTROLLER_REQUEST_API

diff --git a/drivers/staging/media/hantro/Makefile → drivers/media/platform/verisilicon/Makefile b/drivers/staging/media/hantro/Makefile → drivers/media/platform/verisilicon/Makefile
diff --git a/drivers/staging/media/hantro/hantro.h → drivers/media/platform/verisilicon/hantro.h b/drivers/staging/media/hantro/hantro.h → drivers/media/platform/verisilicon/hantro.h
diff --git a/drivers/staging/media/hantro/hantro_drv.c → ...s/media/platform/verisilicon/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c → ...s/media/platform/verisilicon/hantro_drv.c
diff --git a/drivers/staging/media/hantro/hantro_g1.c → ...rs/media/platform/verisilicon/hantro_g1.c b/drivers/staging/media/hantro/hantro_g1.c → ...rs/media/platform/verisilicon/hantro_g1.c
diff --git a/...staging/media/hantro/hantro_g1_h264_dec.c → ...platform/verisilicon/hantro_g1_h264_dec.c b/...staging/media/hantro/hantro_g1_h264_dec.c → ...platform/verisilicon/hantro_g1_h264_dec.c
diff --git a/...taging/media/hantro/hantro_g1_mpeg2_dec.c → ...latform/verisilicon/hantro_g1_mpeg2_dec.c b/...taging/media/hantro/hantro_g1_mpeg2_dec.c → ...latform/verisilicon/hantro_g1_mpeg2_dec.c
diff --git a/...ers/staging/media/hantro/hantro_g1_regs.h → ...dia/platform/verisilicon/hantro_g1_regs.h b/...ers/staging/media/hantro/hantro_g1_regs.h → ...dia/platform/verisilicon/hantro_g1_regs.h
diff --git a/.../staging/media/hantro/hantro_g1_vp8_dec.c → .../platform/verisilicon/hantro_g1_vp8_dec.c b/.../staging/media/hantro/hantro_g1_vp8_dec.c → .../platform/verisilicon/hantro_g1_vp8_dec.c
diff --git a/drivers/staging/media/hantro/hantro_g2.c → ...rs/media/platform/verisilicon/hantro_g2.c b/drivers/staging/media/hantro/hantro_g2.c → ...rs/media/platform/verisilicon/hantro_g2.c
diff --git a/...staging/media/hantro/hantro_g2_hevc_dec.c → ...platform/verisilicon/hantro_g2_hevc_dec.c b/...staging/media/hantro/hantro_g2_hevc_dec.c → ...platform/verisilicon/hantro_g2_hevc_dec.c
diff --git a/...ers/staging/media/hantro/hantro_g2_regs.h → ...dia/platform/verisilicon/hantro_g2_regs.h b/...ers/staging/media/hantro/hantro_g2_regs.h → ...dia/platform/verisilicon/hantro_g2_regs.h
diff --git a/.../staging/media/hantro/hantro_g2_vp9_dec.c → .../platform/verisilicon/hantro_g2_vp9_dec.c b/.../staging/media/hantro/hantro_g2_vp9_dec.c → .../platform/verisilicon/hantro_g2_vp9_dec.c
diff --git a/...staging/media/hantro/hantro_h1_jpeg_enc.c → ...platform/verisilicon/hantro_h1_jpeg_enc.c b/...staging/media/hantro/hantro_h1_jpeg_enc.c → ...platform/verisilicon/hantro_h1_jpeg_enc.c
diff --git a/...ers/staging/media/hantro/hantro_h1_regs.h → ...dia/platform/verisilicon/hantro_h1_regs.h b/...ers/staging/media/hantro/hantro_h1_regs.h → ...dia/platform/verisilicon/hantro_h1_regs.h
diff --git a/drivers/staging/media/hantro/hantro_h264.c → .../media/platform/verisilicon/hantro_h264.c b/drivers/staging/media/hantro/hantro_h264.c → .../media/platform/verisilicon/hantro_h264.c
diff --git a/drivers/staging/media/hantro/hantro_hevc.c → .../media/platform/verisilicon/hantro_hevc.c b/drivers/staging/media/hantro/hantro_hevc.c → .../media/platform/verisilicon/hantro_hevc.c
diff --git a/drivers/staging/media/hantro/hantro_hw.h → ...rs/media/platform/verisilicon/hantro_hw.h b/drivers/staging/media/hantro/hantro_hw.h → ...rs/media/platform/verisilicon/hantro_hw.h
diff --git a/drivers/staging/media/hantro/hantro_jpeg.c → .../media/platform/verisilicon/hantro_jpeg.c b/drivers/staging/media/hantro/hantro_jpeg.c → .../media/platform/verisilicon/hantro_jpeg.c
diff --git a/drivers/staging/media/hantro/hantro_jpeg.h → .../media/platform/verisilicon/hantro_jpeg.h b/drivers/staging/media/hantro/hantro_jpeg.h → .../media/platform/verisilicon/hantro_jpeg.h
diff --git a/drivers/staging/media/hantro/hantro_mpeg2.c → ...media/platform/verisilicon/hantro_mpeg2.c b/drivers/staging/media/hantro/hantro_mpeg2.c → ...media/platform/verisilicon/hantro_mpeg2.c
diff --git a/...rs/staging/media/hantro/hantro_postproc.c → ...ia/platform/verisilicon/hantro_postproc.c b/...rs/staging/media/hantro/hantro_postproc.c → ...ia/platform/verisilicon/hantro_postproc.c
diff --git a/drivers/staging/media/hantro/hantro_v4l2.c → .../media/platform/verisilicon/hantro_v4l2.c b/drivers/staging/media/hantro/hantro_v4l2.c → .../media/platform/verisilicon/hantro_v4l2.c
diff --git a/drivers/staging/media/hantro/hantro_v4l2.h → .../media/platform/verisilicon/hantro_v4l2.h b/drivers/staging/media/hantro/hantro_v4l2.h → .../media/platform/verisilicon/hantro_v4l2.h
diff --git a/drivers/staging/media/hantro/hantro_vp8.c → ...s/media/platform/verisilicon/hantro_vp8.c b/drivers/staging/media/hantro/hantro_vp8.c → ...s/media/platform/verisilicon/hantro_vp8.c
diff --git a/drivers/staging/media/hantro/hantro_vp9.c → ...s/media/platform/verisilicon/hantro_vp9.c b/drivers/staging/media/hantro/hantro_vp9.c → ...s/media/platform/verisilicon/hantro_vp9.c
diff --git a/drivers/staging/media/hantro/hantro_vp9.h → ...s/media/platform/verisilicon/hantro_vp9.h b/drivers/staging/media/hantro/hantro_vp9.h → ...s/media/platform/verisilicon/hantro_vp9.h
diff --git a/drivers/staging/media/hantro/imx8m_vpu_hw.c → ...media/platform/verisilicon/imx8m_vpu_hw.c b/drivers/staging/media/hantro/imx8m_vpu_hw.c → ...media/platform/verisilicon/imx8m_vpu_hw.c
diff --git a/.../media/hantro/rockchip_vpu2_hw_h264_dec.c → ...m/verisilicon/rockchip_vpu2_hw_h264_dec.c b/.../media/hantro/rockchip_vpu2_hw_h264_dec.c → ...m/verisilicon/rockchip_vpu2_hw_h264_dec.c
diff --git a/.../media/hantro/rockchip_vpu2_hw_jpeg_enc.c → ...m/verisilicon/rockchip_vpu2_hw_jpeg_enc.c b/.../media/hantro/rockchip_vpu2_hw_jpeg_enc.c → ...m/verisilicon/rockchip_vpu2_hw_jpeg_enc.c
diff --git a/...media/hantro/rockchip_vpu2_hw_mpeg2_dec.c → .../verisilicon/rockchip_vpu2_hw_mpeg2_dec.c b/...media/hantro/rockchip_vpu2_hw_mpeg2_dec.c → .../verisilicon/rockchip_vpu2_hw_mpeg2_dec.c
diff --git a/...g/media/hantro/rockchip_vpu2_hw_vp8_dec.c → ...rm/verisilicon/rockchip_vpu2_hw_vp8_dec.c b/...g/media/hantro/rockchip_vpu2_hw_vp8_dec.c → ...rm/verisilicon/rockchip_vpu2_hw_vp8_dec.c
diff --git a/...staging/media/hantro/rockchip_vpu2_regs.h → ...platform/verisilicon/rockchip_vpu2_regs.h b/...staging/media/hantro/rockchip_vpu2_regs.h → ...platform/verisilicon/rockchip_vpu2_regs.h
diff --git a/...rs/staging/media/hantro/rockchip_vpu_hw.c → ...ia/platform/verisilicon/rockchip_vpu_hw.c b/...rs/staging/media/hantro/rockchip_vpu_hw.c → ...ia/platform/verisilicon/rockchip_vpu_hw.c
diff --git a/...rs/staging/media/hantro/sama5d4_vdec_hw.c → ...ia/platform/verisilicon/sama5d4_vdec_hw.c b/...rs/staging/media/hantro/sama5d4_vdec_hw.c → ...ia/platform/verisilicon/sama5d4_vdec_hw.c
diff --git a/drivers/staging/media/hantro/sunxi_vpu_hw.c → ...media/platform/verisilicon/sunxi_vpu_hw.c b/drivers/staging/media/hantro/sunxi_vpu_hw.c → ...media/platform/verisilicon/sunxi_vpu_hw.c
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
@@ -22,8 +22,6 @@ if STAGING_MEDIA && MEDIA_SUPPORT
 # Please keep them in alphabetic order
 source "drivers/staging/media/atomisp/Kconfig"
 
-source "drivers/staging/media/hantro/Kconfig"
-
 source "drivers/staging/media/imx/Kconfig"
 
 source "drivers/staging/media/ipu3/Kconfig"

diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
@@ -10,7 +10,6 @@ obj-$(CONFIG_VIDEO_ROCKCHIP_VDEC)	+= rkvdec/
 obj-$(CONFIG_VIDEO_STKWEBCAM)	+= deprecated/stkwebcam/
 obj-$(CONFIG_VIDEO_SUNXI)	+= sunxi/
 obj-$(CONFIG_VIDEO_TEGRA)	+= tegra-video/
-obj-$(CONFIG_VIDEO_HANTRO)	+= hantro/
 obj-$(CONFIG_VIDEO_IPU3_IMGU)	+= ipu3/
 obj-$(CONFIG_VIDEO_TM6000)	+= deprecated/tm6000/
 obj-$(CONFIG_VIDEO_VIU)		+= deprecated/fsl-viu/

diff --git a/drivers/staging/media/hantro/TODO b/drivers/staging/media/hantro/TODO