From 8bd4aaf438e39f88e4321e0cad2d42284c2269af Mon Sep 17 00:00:00 2001 From: Dmitry Osipenko Date: Sun, 20 Feb 2022 21:46:21 +0100 Subject: [PATCH] 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 Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 17 +++++++++++++++++ drivers/media/platform/Makefile | 2 ++ .../tegra-vde => media/platform/tegra/vde}/Makefile | 2 +- .../platform/tegra/vde}/dmabuf-cache.c | 0 .../media/tegra-vde => media/platform/tegra/vde}/h264.c | 0 .../tegra-vde => media/platform/tegra/vde}/iommu.c | 0 .../tegra-vde => media/platform/tegra/vde}/trace.h | 2 +- .../media/tegra-vde => media/platform/tegra/vde}/v4l2.c | 0 .../media/tegra-vde => media/platform/tegra/vde}/vde.c | 0 .../media/tegra-vde => media/platform/tegra/vde}/vde.h | 0 drivers/staging/media/Kconfig | 2 -- drivers/staging/media/Makefile | 1 - drivers/staging/media/tegra-vde/Kconfig | 17 ----------------- drivers/staging/media/tegra-vde/TODO | 4 ---- 15 files changed, 22 insertions(+), 27 deletions(-) rename drivers/{staging/media/tegra-vde => media/platform/tegra/vde}/Makefile (67%) rename drivers/{staging/media/tegra-vde => media/platform/tegra/vde}/dmabuf-cache.c (100%) rename drivers/{staging/media/tegra-vde => media/platform/tegra/vde}/h264.c (100%) rename drivers/{staging/media/tegra-vde => media/platform/tegra/vde}/iommu.c (100%) rename drivers/{staging/media/tegra-vde => media/platform/tegra/vde}/trace.h (97%) rename drivers/{staging/media/tegra-vde => media/platform/tegra/vde}/v4l2.c (100%) rename drivers/{staging/media/tegra-vde => media/platform/tegra/vde}/vde.c (100%) rename drivers/{staging/media/tegra-vde => media/platform/tegra/vde}/vde.h (100%) delete mode 100644 drivers/staging/media/tegra-vde/Kconfig delete mode 100644 drivers/staging/media/tegra-vde/TODO diff --git a/MAINTAINERS b/MAINTAINERS index 83d27b5..f2d313b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11947,7 +11947,7 @@ L: linux-tegra@vger.kernel.org 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 diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 9fbdba0..97a191a 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -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 diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 28eb4aa..4c6fdca 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -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/ diff --git a/drivers/staging/media/tegra-vde/Makefile b/drivers/media/platform/tegra/vde/Makefile similarity index 67% rename from drivers/staging/media/tegra-vde/Makefile rename to drivers/media/platform/tegra/vde/Makefile index 1758aa2..4e96f33 100644 --- a/drivers/staging/media/tegra-vde/Makefile +++ b/drivers/media/platform/tegra/vde/Makefile @@ -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 diff --git a/drivers/staging/media/tegra-vde/dmabuf-cache.c b/drivers/media/platform/tegra/vde/dmabuf-cache.c similarity index 100% rename from drivers/staging/media/tegra-vde/dmabuf-cache.c rename to drivers/media/platform/tegra/vde/dmabuf-cache.c diff --git a/drivers/staging/media/tegra-vde/h264.c b/drivers/media/platform/tegra/vde/h264.c similarity index 100% rename from drivers/staging/media/tegra-vde/h264.c rename to drivers/media/platform/tegra/vde/h264.c diff --git a/drivers/staging/media/tegra-vde/iommu.c b/drivers/media/platform/tegra/vde/iommu.c similarity index 100% rename from drivers/staging/media/tegra-vde/iommu.c rename to drivers/media/platform/tegra/vde/iommu.c diff --git a/drivers/staging/media/tegra-vde/trace.h b/drivers/media/platform/tegra/vde/trace.h similarity index 97% rename from drivers/staging/media/tegra-vde/trace.h rename to drivers/media/platform/tegra/vde/trace.h index e571410..77358dd 100644 --- a/drivers/staging/media/tegra-vde/trace.h +++ b/drivers/media/platform/tegra/vde/trace.h @@ -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 diff --git a/drivers/staging/media/tegra-vde/v4l2.c b/drivers/media/platform/tegra/vde/v4l2.c similarity index 100% rename from drivers/staging/media/tegra-vde/v4l2.c rename to drivers/media/platform/tegra/vde/v4l2.c diff --git a/drivers/staging/media/tegra-vde/vde.c b/drivers/media/platform/tegra/vde/vde.c similarity index 100% rename from drivers/staging/media/tegra-vde/vde.c rename to drivers/media/platform/tegra/vde/vde.c diff --git a/drivers/staging/media/tegra-vde/vde.h b/drivers/media/platform/tegra/vde/vde.h similarity index 100% rename from drivers/staging/media/tegra-vde/vde.h rename to drivers/media/platform/tegra/vde/vde.h diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig index b81cfa7..1fd6a0c 100644 --- a/drivers/staging/media/Kconfig +++ b/drivers/staging/media/Kconfig @@ -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" diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile index 7e2c86e3..66d6f6d 100644 --- a/drivers/staging/media/Makefile +++ b/drivers/staging/media/Makefile @@ -7,7 +7,6 @@ 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/ obj-$(CONFIG_VIDEO_ZORAN) += zoran/ diff --git a/drivers/staging/media/tegra-vde/Kconfig b/drivers/staging/media/tegra-vde/Kconfig deleted file mode 100644 index 07dbc1f..0000000 --- a/drivers/staging/media/tegra-vde/Kconfig +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -config 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 - Say Y here to enable support for the NVIDIA Tegra video decoder - driver. diff --git a/drivers/staging/media/tegra-vde/TODO b/drivers/staging/media/tegra-vde/TODO deleted file mode 100644 index 31aaa3e..0000000 --- a/drivers/staging/media/tegra-vde/TODO +++ /dev/null @@ -1,4 +0,0 @@ -TODO: - - Implement V4L2 API once it gains support for stateless decoders. - -Contact: Dmitry Osipenko -- 2.7.4