Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-04 04:02:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

media: destage Hantro VPU driver

Browse Source 
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>
This commit is contained in:
Ezequiel Garcia 2022-07-18 23:41:21 +02:00 committed by Mauro Carvalho Chehab
parent 61890ccaef
commit fbb6c848dd
42 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@ -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>

1
drivers/media/platform/Kconfig
View File

@ -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"

1
drivers/media/platform/Makefile
View File

@ -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/

6
drivers/staging/media/hantro/Kconfig → drivers/media/platform/verisilicon/Kconfig
View File

@ -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

0
drivers/staging/media/hantro/Makefile → drivers/media/platform/verisilicon/Makefile
View File

0
drivers/staging/media/hantro/hantro.h → drivers/media/platform/verisilicon/hantro.h
View File

0
drivers/staging/media/hantro/hantro_drv.c → drivers/media/platform/verisilicon/hantro_drv.c
View File

0
drivers/staging/media/hantro/hantro_g1.c → drivers/media/platform/verisilicon/hantro_g1.c
View File

0
drivers/staging/media/hantro/hantro_g1_h264_dec.c → drivers/media/platform/verisilicon/hantro_g1_h264_dec.c
View File

0
drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c → drivers/media/platform/verisilicon/hantro_g1_mpeg2_dec.c
View File

0
drivers/staging/media/hantro/hantro_g1_regs.h → drivers/media/platform/verisilicon/hantro_g1_regs.h
View File

0
drivers/staging/media/hantro/hantro_g1_vp8_dec.c → drivers/media/platform/verisilicon/hantro_g1_vp8_dec.c
View File

0
drivers/staging/media/hantro/hantro_g2.c → drivers/media/platform/verisilicon/hantro_g2.c
View File

0
drivers/staging/media/hantro/hantro_g2_hevc_dec.c → drivers/media/platform/verisilicon/hantro_g2_hevc_dec.c
View File

0
drivers/staging/media/hantro/hantro_g2_regs.h → drivers/media/platform/verisilicon/hantro_g2_regs.h
View File

0
drivers/staging/media/hantro/hantro_g2_vp9_dec.c → drivers/media/platform/verisilicon/hantro_g2_vp9_dec.c
View File

0
drivers/staging/media/hantro/hantro_h1_jpeg_enc.c → drivers/media/platform/verisilicon/hantro_h1_jpeg_enc.c
View File

0
drivers/staging/media/hantro/hantro_h1_regs.h → drivers/media/platform/verisilicon/hantro_h1_regs.h
View File

0
drivers/staging/media/hantro/hantro_h264.c → drivers/media/platform/verisilicon/hantro_h264.c
View File

0
drivers/staging/media/hantro/hantro_hevc.c → drivers/media/platform/verisilicon/hantro_hevc.c
View File

0
drivers/staging/media/hantro/hantro_hw.h → drivers/media/platform/verisilicon/hantro_hw.h
View File

0
drivers/staging/media/hantro/hantro_jpeg.c → drivers/media/platform/verisilicon/hantro_jpeg.c
View File

0
drivers/staging/media/hantro/hantro_jpeg.h → drivers/media/platform/verisilicon/hantro_jpeg.h
View File

0
drivers/staging/media/hantro/hantro_mpeg2.c → drivers/media/platform/verisilicon/hantro_mpeg2.c
View File

0
drivers/staging/media/hantro/hantro_postproc.c → drivers/media/platform/verisilicon/hantro_postproc.c
View File

0
drivers/staging/media/hantro/hantro_v4l2.c → drivers/media/platform/verisilicon/hantro_v4l2.c
View File

0
drivers/staging/media/hantro/hantro_v4l2.h → drivers/media/platform/verisilicon/hantro_v4l2.h
View File

0
drivers/staging/media/hantro/hantro_vp8.c → drivers/media/platform/verisilicon/hantro_vp8.c
View File

0
drivers/staging/media/hantro/hantro_vp9.c → drivers/media/platform/verisilicon/hantro_vp9.c
View File

0
drivers/staging/media/hantro/hantro_vp9.h → drivers/media/platform/verisilicon/hantro_vp9.h
View File

0
drivers/staging/media/hantro/imx8m_vpu_hw.c → drivers/media/platform/verisilicon/imx8m_vpu_hw.c
View File

0
drivers/staging/media/hantro/rockchip_vpu2_hw_h264_dec.c → drivers/media/platform/verisilicon/rockchip_vpu2_hw_h264_dec.c
View File

0
drivers/staging/media/hantro/rockchip_vpu2_hw_jpeg_enc.c → drivers/media/platform/verisilicon/rockchip_vpu2_hw_jpeg_enc.c
View File

0
drivers/staging/media/hantro/rockchip_vpu2_hw_mpeg2_dec.c → drivers/media/platform/verisilicon/rockchip_vpu2_hw_mpeg2_dec.c
View File

0
drivers/staging/media/hantro/rockchip_vpu2_hw_vp8_dec.c → drivers/media/platform/verisilicon/rockchip_vpu2_hw_vp8_dec.c
View File

0
drivers/staging/media/hantro/rockchip_vpu2_regs.h → drivers/media/platform/verisilicon/rockchip_vpu2_regs.h
View File

0
drivers/staging/media/hantro/rockchip_vpu_hw.c → drivers/media/platform/verisilicon/rockchip_vpu_hw.c
View File

0
drivers/staging/media/hantro/sama5d4_vdec_hw.c → drivers/media/platform/verisilicon/sama5d4_vdec_hw.c
View File

0
drivers/staging/media/hantro/sunxi_vpu_hw.c → drivers/media/platform/verisilicon/sunxi_vpu_hw.c
View File

2
drivers/staging/media/Kconfig
View File

@ -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"

1
drivers/staging/media/Makefile
View File

@ -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/

2
drivers/staging/media/hantro/TODO
View File

@ -1,2 +0,0 @@
The V4L controls for the HEVC CODEC are not yet part of the stable uABI,
we are keeping this driver in staging until the HEVC uABI has been merged.