Skip to content

Commit

Permalink
media: tegra: vde: De-stage driver
Browse files Browse the repository at this point in the history
The TODO of tegra-vde driver has been completed, driver now supports
V4L2 stateless video decoding API. Relocate driver to drivers/media.

Signed-off-by: Dmitry Osipenko <[email protected]>
  • Loading branch information
digetx committed Feb 18, 2022
1 parent 5b2c591 commit 0825be4
Show file tree
Hide file tree
Showing 15 changed files with 22 additions and 27 deletions.
2 changes: 1 addition & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -12071,7 +12071,7 @@ L: [email protected]
S: Maintained
T: git git://linuxtv.org/media_tree.git
F: Documentation/devicetree/bindings/media/nvidia,tegra-vde.txt
F: drivers/staging/media/tegra-vde/
F: drivers/media/platform/tegra/vde/

MEDIA DRIVERS FOR RENESAS - CEU
M: Jacopo Mondi <[email protected]>
Expand Down
17 changes: 17 additions & 0 deletions drivers/media/platform/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -630,6 +630,23 @@ config VIDEO_SUN8I_ROTATE
Support for the Allwinner DE2 rotation unit.
To compile this driver as a module choose m here.

config VIDEO_TEGRA_VDE
tristate "NVIDIA Tegra Video Decoder Engine driver"
depends on ARCH_TEGRA || COMPILE_TEST
depends on VIDEO_DEV && VIDEO_V4L2
select DMA_SHARED_BUFFER
select IOMMU_IOVA
select MEDIA_CONTROLLER
select MEDIA_CONTROLLER_REQUEST_API
select SRAM
select VIDEOBUF2_DMA_CONTIG
select VIDEOBUF2_DMA_SG
select V4L2_H264
select V4L2_MEM2MEM_DEV
help
Support for the NVIDIA Tegra video decoder unit.
To compile this driver as a module choose m here.

endif # V4L_MEM2MEM_DRIVERS

# TI VIDEO PORT Helper Modules
Expand Down
2 changes: 2 additions & 0 deletions drivers/media/platform/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,5 @@ obj-$(CONFIG_VIDEO_QCOM_VENUS) += qcom/venus/
obj-y += sunxi/

obj-$(CONFIG_VIDEO_MESON_GE2D) += meson/ge2d/

obj-$(CONFIG_VIDEO_TEGRA_VDE) += tegra/vde/
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# SPDX-License-Identifier: GPL-2.0
tegra-vde-y := vde.o iommu.o dmabuf-cache.o h264.o v4l2.o
obj-$(CONFIG_TEGRA_VDE) += tegra-vde.o
obj-$(CONFIG_VIDEO_TEGRA_VDE) += tegra-vde.o
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,6 @@ TRACE_EVENT(vde_ref_l1,

/* This part must be outside protection */
#undef TRACE_INCLUDE_PATH
#define TRACE_INCLUDE_PATH ../../drivers/staging/media/tegra-vde
#define TRACE_INCLUDE_PATH ../../drivers/media/platform/tegra/vde
#define TRACE_INCLUDE_FILE trace
#include <trace/define_trace.h>
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 0 additions & 2 deletions drivers/staging/media/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ source "drivers/staging/media/rkvdec/Kconfig"

source "drivers/staging/media/sunxi/Kconfig"

source "drivers/staging/media/tegra-vde/Kconfig"

source "drivers/staging/media/zoran/Kconfig"

source "drivers/staging/media/tegra-video/Kconfig"
Expand Down
1 change: 0 additions & 1 deletion drivers/staging/media/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ obj-$(CONFIG_VIDEO_MESON_VDEC) += meson/vdec/
obj-$(CONFIG_VIDEO_OMAP4) += omap4iss/
obj-$(CONFIG_VIDEO_ROCKCHIP_VDEC) += rkvdec/
obj-$(CONFIG_VIDEO_SUNXI) += sunxi/
obj-$(CONFIG_VIDEO_TEGRA) += tegra-video/
obj-$(CONFIG_TEGRA_VDE) += tegra-vde/
obj-$(CONFIG_VIDEO_HANTRO) += hantro/
obj-$(CONFIG_VIDEO_IPU3_IMGU) += ipu3/
Expand Down
17 changes: 0 additions & 17 deletions drivers/staging/media/tegra-vde/Kconfig

This file was deleted.

4 changes: 0 additions & 4 deletions drivers/staging/media/tegra-vde/TODO

This file was deleted.

0 comments on commit 0825be4

Please sign in to comment.