History

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.

Ezequiel Garcia committed 4 years ago

Commit fbb6c841 parent 61890cc42 files · +8 −7Browse files

Unified · Split

42 files
  1. MAINTAINERS +1 −1
  2. drivers/media/platform/Kconfig +1 −0
  3. drivers/media/platform/Makefile +1 −0
  4. drivers/media/platform/verisilicon/Kconfig +5 −1
  5. drivers/media/platform/verisilicon/Makefile +0 −0
  6. drivers/media/platform/verisilicon/hantro.h +0 −0
  7. drivers/media/platform/verisilicon/hantro_drv.c +0 −0
  8. drivers/media/platform/verisilicon/hantro_g1.c +0 −0
  9. drivers/media/platform/verisilicon/hantro_g1_h264_dec.c +0 −0
  10. drivers/media/platform/verisilicon/hantro_g1_mpeg2_dec.c +0 −0
  11. drivers/media/platform/verisilicon/hantro_g1_regs.h +0 −0
  12. drivers/media/platform/verisilicon/hantro_g1_vp8_dec.c +0 −0
  13. drivers/media/platform/verisilicon/hantro_g2.c +0 −0
  14. drivers/media/platform/verisilicon/hantro_g2_hevc_dec.c +0 −0
  15. drivers/media/platform/verisilicon/hantro_g2_regs.h +0 −0
  16. drivers/media/platform/verisilicon/hantro_g2_vp9_dec.c +0 −0
  17. drivers/media/platform/verisilicon/hantro_h1_jpeg_enc.c +0 −0
  18. drivers/media/platform/verisilicon/hantro_h1_regs.h +0 −0
  19. drivers/media/platform/verisilicon/hantro_h264.c +0 −0
  20. drivers/media/platform/verisilicon/hantro_hevc.c +0 −0
  21. drivers/media/platform/verisilicon/hantro_hw.h +0 −0
  22. drivers/media/platform/verisilicon/hantro_jpeg.c +0 −0
  23. drivers/media/platform/verisilicon/hantro_jpeg.h +0 −0
  24. drivers/media/platform/verisilicon/hantro_mpeg2.c +0 −0
  25. drivers/media/platform/verisilicon/hantro_postproc.c +0 −0
  26. drivers/media/platform/verisilicon/hantro_v4l2.c +0 −0
  27. drivers/media/platform/verisilicon/hantro_v4l2.h +0 −0
  28. drivers/media/platform/verisilicon/hantro_vp8.c +0 −0
  29. drivers/media/platform/verisilicon/hantro_vp9.c +0 −0
  30. drivers/media/platform/verisilicon/hantro_vp9.h +0 −0
  31. drivers/media/platform/verisilicon/imx8m_vpu_hw.c +0 −0
  32. drivers/media/platform/verisilicon/rockchip_vpu2_hw_h264_dec.c +0 −0
  33. drivers/media/platform/verisilicon/rockchip_vpu2_hw_jpeg_enc.c +0 −0
  34. drivers/media/platform/verisilicon/rockchip_vpu2_hw_mpeg2_dec.c +0 −0
  35. drivers/media/platform/verisilicon/rockchip_vpu2_hw_vp8_dec.c +0 −0
  36. drivers/media/platform/verisilicon/rockchip_vpu2_regs.h +0 −0
  37. drivers/media/platform/verisilicon/rockchip_vpu_hw.c +0 −0
  38. drivers/media/platform/verisilicon/sama5d4_vdec_hw.c +0 −0
  39. drivers/media/platform/verisilicon/sunxi_vpu_hw.c +0 −0
  40. drivers/staging/media/Kconfig +0 −2
  41. drivers/staging/media/Makefile +0 −1
  42. drivers/staging/media/hantro/TODO +0 −2
MAINTAINERS+1−1
@@ -8904,7 +8904,7 @@ S: Maintained · 8903 unmodified lines
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 <frank@f-seidel.de>
drivers/media/platform/Kconfig+1−0
@@ -81,6 +81,7 @@ source "drivers/media/platform/samsung/Kconfig" · 80 unmodified lines
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+1−0
@@ -24,6 +24,7 @@ obj-y += samsung/ · 23 unmodified lines
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/media/platform/verisilicon/Kconfigrenamed from drivers/staging/media/hantro/Kconfig+5−1
@@ -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/media/platform/verisilicon/Makefilerenamed from drivers/staging/media/hantro/Makefile+0−0

File renamed without changes.

drivers/media/platform/verisilicon/hantro.hrenamed from drivers/staging/media/hantro/hantro.h+0−0

File renamed without changes.

drivers/media/platform/verisilicon/hantro_drv.crenamed from drivers/staging/media/hantro/hantro_drv.c+0−0

File renamed without changes.

drivers/media/platform/verisilicon/hantro_g1.crenamed from drivers/staging/media/hantro/hantro_g1.c+0−0

File renamed without changes.

drivers/media/platform/verisilicon/hantro_g1_h264_dec.crenamed from drivers/staging/media/hantro/hantro_g1_h264_dec.c+0−0

File renamed without changes.

drivers/media/platform/verisilicon/hantro_g1_mpeg2_dec.crenamed from drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c+0−0

File renamed without changes.

drivers/media/platform/verisilicon/hantro_g1_regs.hrenamed from drivers/staging/media/hantro/hantro_g1_regs.h+0−0

File renamed without changes.

drivers/media/platform/verisilicon/hantro_g1_vp8_dec.crenamed from drivers/staging/media/hantro/hantro_g1_vp8_dec.c+0−0

File renamed without changes.

drivers/media/platform/verisilicon/hantro_g2.crenamed from drivers/staging/media/hantro/hantro_g2.c+0−0

File renamed without changes.

drivers/media/platform/verisilicon/hantro_g2_hevc_dec.crenamed from drivers/staging/media/hantro/hantro_g2_hevc_dec.c+0−0

File renamed without changes.

drivers/media/platform/verisilicon/hantro_g2_regs.hrenamed from drivers/staging/media/hantro/hantro_g2_regs.h+0−0

File renamed without changes.

drivers/media/platform/verisilicon/hantro_g2_vp9_dec.crenamed from drivers/staging/media/hantro/hantro_g2_vp9_dec.c+0−0

File renamed without changes.

drivers/media/platform/verisilicon/hantro_h1_jpeg_enc.crenamed from drivers/staging/media/hantro/hantro_h1_jpeg_enc.c+0−0

File renamed without changes.

drivers/media/platform/verisilicon/hantro_h1_regs.hrenamed from drivers/staging/media/hantro/hantro_h1_regs.h+0−0

File renamed without changes.

drivers/media/platform/verisilicon/hantro_h264.crenamed from drivers/staging/media/hantro/hantro_h264.c+0−0

File renamed without changes.

drivers/media/platform/verisilicon/hantro_hevc.crenamed from drivers/staging/media/hantro/hantro_hevc.c+0−0

File renamed without changes.

drivers/media/platform/verisilicon/hantro_hw.hrenamed from drivers/staging/media/hantro/hantro_hw.h+0−0

File renamed without changes.

drivers/media/platform/verisilicon/hantro_jpeg.crenamed from drivers/staging/media/hantro/hantro_jpeg.c+0−0

File renamed without changes.

drivers/media/platform/verisilicon/hantro_jpeg.hrenamed from drivers/staging/media/hantro/hantro_jpeg.h+0−0

File renamed without changes.

drivers/media/platform/verisilicon/hantro_mpeg2.crenamed from drivers/staging/media/hantro/hantro_mpeg2.c+0−0

File renamed without changes.

drivers/media/platform/verisilicon/hantro_postproc.crenamed from drivers/staging/media/hantro/hantro_postproc.c+0−0

File renamed without changes.

drivers/media/platform/verisilicon/hantro_v4l2.crenamed from drivers/staging/media/hantro/hantro_v4l2.c+0−0

File renamed without changes.

drivers/media/platform/verisilicon/hantro_v4l2.hrenamed from drivers/staging/media/hantro/hantro_v4l2.h+0−0

File renamed without changes.

drivers/media/platform/verisilicon/hantro_vp8.crenamed from drivers/staging/media/hantro/hantro_vp8.c+0−0

File renamed without changes.

drivers/media/platform/verisilicon/hantro_vp9.crenamed from drivers/staging/media/hantro/hantro_vp9.c+0−0

File renamed without changes.

drivers/media/platform/verisilicon/hantro_vp9.hrenamed from drivers/staging/media/hantro/hantro_vp9.h+0−0

File renamed without changes.

drivers/media/platform/verisilicon/imx8m_vpu_hw.crenamed from drivers/staging/media/hantro/imx8m_vpu_hw.c+0−0

File renamed without changes.

drivers/media/platform/verisilicon/rockchip_vpu2_hw_h264_dec.crenamed from drivers/staging/media/hantro/rockchip_vpu2_hw_h264_dec.c+0−0

File renamed without changes.

drivers/media/platform/verisilicon/rockchip_vpu2_hw_jpeg_enc.crenamed from drivers/staging/media/hantro/rockchip_vpu2_hw_jpeg_enc.c+0−0

File renamed without changes.

drivers/media/platform/verisilicon/rockchip_vpu2_hw_mpeg2_dec.crenamed from drivers/staging/media/hantro/rockchip_vpu2_hw_mpeg2_dec.c+0−0

File renamed without changes.

drivers/media/platform/verisilicon/rockchip_vpu2_hw_vp8_dec.crenamed from drivers/staging/media/hantro/rockchip_vpu2_hw_vp8_dec.c+0−0

File renamed without changes.

drivers/media/platform/verisilicon/rockchip_vpu2_regs.hrenamed from drivers/staging/media/hantro/rockchip_vpu2_regs.h+0−0

File renamed without changes.

drivers/media/platform/verisilicon/rockchip_vpu_hw.crenamed from drivers/staging/media/hantro/rockchip_vpu_hw.c+0−0

File renamed without changes.

drivers/media/platform/verisilicon/sama5d4_vdec_hw.crenamed from drivers/staging/media/hantro/sama5d4_vdec_hw.c+0−0

File renamed without changes.

drivers/media/platform/verisilicon/sunxi_vpu_hw.crenamed from drivers/staging/media/hantro/sunxi_vpu_hw.c+0−0

File renamed without changes.

drivers/staging/media/Kconfig+0−2
@@ -22,8 +22,6 @@ if STAGING_MEDIA && MEDIA_SUPPORT · 21 unmodified lines
2222 # Please keep them in alphabetic order
2323 source "drivers/staging/media/atomisp/Kconfig"
2424
25−source "drivers/staging/media/hantro/Kconfig"
26−
2725 source "drivers/staging/media/imx/Kconfig"
2826
2927 source "drivers/staging/media/ipu3/Kconfig"
drivers/staging/media/Makefile+0−1
@@ -10,7 +10,6 @@ obj-$(CONFIG_VIDEO_ROCKCHIP_VDEC) += rkvdec/ · 9 unmodified lines
1010 obj-$(CONFIG_VIDEO_STKWEBCAM) += deprecated/stkwebcam/
1111 obj-$(CONFIG_VIDEO_SUNXI) += sunxi/
1212 obj-$(CONFIG_VIDEO_TEGRA) += tegra-video/
13−obj-$(CONFIG_VIDEO_HANTRO) += hantro/
1413 obj-$(CONFIG_VIDEO_IPU3_IMGU) += ipu3/
1514 obj-$(CONFIG_VIDEO_TM6000) += deprecated/tm6000/
1615 obj-$(CONFIG_VIDEO_VIU) += deprecated/fsl-viu/
drivers/staging/media/hantro/TODO+0−2
@@ -1,2 +0,0 @@
1−The V4L controls for the HEVC CODEC are not yet part of the stable uABI,
2−we are keeping this driver in staging until the HEVC uABI has been merged.

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t