Skip to content

Commit fbb6c84

Browse files
ezequielgarciamchehab
ezequielgarcia
authored and
mchehab
committed
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 <[email protected]> Signed-off-by: Hans Verkuil <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
1 parent 61890cc commit fbb6c84

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+8
-7
lines changed

‎MAINTAINERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8904,7 +8904,7 @@ S: Maintained
89048904
F: Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml
89058905
F: Documentation/devicetree/bindings/media/rockchip,rk3568-vepu.yaml
89068906
F: Documentation/devicetree/bindings/media/rockchip-vpu.yaml
8907-
F: drivers/staging/media/hantro/
8907+
F: drivers/media/platform/verisilicon/
89088908

89098909
HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
89108910
M: Frank Seidel <[email protected]>

‎drivers/media/platform/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ source "drivers/media/platform/samsung/Kconfig"
8181
source "drivers/media/platform/st/Kconfig"
8282
source "drivers/media/platform/sunxi/Kconfig"
8383
source "drivers/media/platform/ti/Kconfig"
84+
source "drivers/media/platform/verisilicon/Kconfig"
8485
source "drivers/media/platform/via/Kconfig"
8586
source "drivers/media/platform/xilinx/Kconfig"
8687

‎drivers/media/platform/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ obj-y += samsung/
2424
obj-y += st/
2525
obj-y += sunxi/
2626
obj-y += ti/
27+
obj-y += verisilicon/
2728
obj-y += via/
2829
obj-y += xilinx/
2930

drivers/staging/media/hantro/Kconfig renamed to drivers/media/platform/verisilicon/Kconfig

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
# SPDX-License-Identifier: GPL-2.0
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
3+
comment "Verisilicon media platform drivers"
4+
25
config VIDEO_HANTRO
36
tristate "Hantro VPU driver"
47
depends on ARCH_MXC || ARCH_ROCKCHIP || ARCH_AT91 || ARCH_SUNXI || COMPILE_TEST
8+
depends on V4L_MEM2MEM_DRIVERS
59
depends on VIDEO_DEV
610
select MEDIA_CONTROLLER
711
select MEDIA_CONTROLLER_REQUEST_API

drivers/staging/media/hantro/Makefile renamed to drivers/media/platform/verisilicon/Makefile

File renamed without changes.

drivers/staging/media/hantro/hantro.h renamed to drivers/media/platform/verisilicon/hantro.h

File renamed without changes.

drivers/staging/media/hantro/hantro_drv.c renamed to drivers/media/platform/verisilicon/hantro_drv.c

File renamed without changes.

drivers/staging/media/hantro/hantro_g1.c renamed to drivers/media/platform/verisilicon/hantro_g1.c

File renamed without changes.

drivers/staging/media/hantro/hantro_g1_h264_dec.c renamed to drivers/media/platform/verisilicon/hantro_g1_h264_dec.c

File renamed without changes.

drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c renamed to drivers/media/platform/verisilicon/hantro_g1_mpeg2_dec.c

File renamed without changes.

0 commit comments

Comments
 (0)