Skip to content

Commit 4bdf19e

Browse files
committed
media: staging: tegra-vde: De-stage driver
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]>
1 parent 2c1c7d2 commit 4bdf19e

File tree

15 files changed

+21
-27
lines changed

15 files changed

+21
-27
lines changed

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12142,7 +12142,7 @@ L: [email protected]
1214212142
S: Maintained
1214312143
T: git git://linuxtv.org/media_tree.git
1214412144
F: Documentation/devicetree/bindings/media/nvidia,tegra-vde.txt
12145-
F: drivers/staging/media/tegra-vde/
12145+
F: drivers/media/platform/tegra/vde/
1214612146

1214712147
MEDIA DRIVERS FOR RENESAS - CEU
1214812148
M: Jacopo Mondi <[email protected]>

drivers/media/platform/Kconfig

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -630,6 +630,23 @@ config VIDEO_SUN8I_ROTATE
630630
Support for the Allwinner DE2 rotation unit.
631631
To compile this driver as a module choose m here.
632632

633+
config VIDEO_TEGRA_VDE
634+
tristate "NVIDIA Tegra Video Decoder Engine driver"
635+
depends on ARCH_TEGRA || COMPILE_TEST
636+
depends on VIDEO_DEV && VIDEO_V4L2
637+
select DMA_SHARED_BUFFER
638+
select IOMMU_IOVA
639+
select MEDIA_CONTROLLER
640+
select MEDIA_CONTROLLER_REQUEST_API
641+
select SRAM
642+
select VIDEOBUF2_DMA_CONTIG
643+
select VIDEOBUF2_DMA_SG
644+
select V4L2_H264
645+
select V4L2_MEM2MEM_DEV
646+
help
647+
Support for the NVIDIA Tegra video decoder unit.
648+
To compile this driver as a module choose m here.
649+
633650
endif # V4L_MEM2MEM_DRIVERS
634651

635652
# TI VIDEO PORT Helper Modules

drivers/media/platform/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ obj-$(CONFIG_VIDEO_STI_DELTA) += sti/delta/
5959
obj-$(CONFIG_VIDEO_STI_HVA) += sti/hva/
6060
obj-$(CONFIG_VIDEO_STM32_DCMI) += stm32/
6161
obj-$(CONFIG_VIDEO_STM32_DMA2D) += stm32/
62+
obj-$(CONFIG_VIDEO_TEGRA_VDE) += tegra/vde/
6263
obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o
6364
obj-$(CONFIG_VIDEO_VIU) += fsl-viu.o
6465
obj-$(CONFIG_VIDEO_XILINX) += xilinx/
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# SPDX-License-Identifier: GPL-2.0
22
tegra-vde-y := vde.o iommu.o dmabuf-cache.o h264.o v4l2.o
3-
obj-$(CONFIG_TEGRA_VDE) += tegra-vde.o
3+
obj-$(CONFIG_VIDEO_TEGRA_VDE) += tegra-vde.o
File renamed without changes.
File renamed without changes.

drivers/staging/media/tegra-vde/trace.h renamed to drivers/media/platform/tegra/vde/trace.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,6 @@ TRACE_EVENT(vde_ref_l1,
9090

9191
/* This part must be outside protection */
9292
#undef TRACE_INCLUDE_PATH
93-
#define TRACE_INCLUDE_PATH ../../drivers/staging/media/tegra-vde
93+
#define TRACE_INCLUDE_PATH ../../drivers/media/platform/tegra/vde
9494
#define TRACE_INCLUDE_FILE trace
9595
#include <trace/define_trace.h>
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)