Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 775fec69 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Mauro Carvalho Chehab
Browse files

media: add Rockchip VPU JPEG encoder driver 



Add a mem2mem driver for the VPU available on Rockchip SoCs.
Currently only JPEG encoding is supported, for RK3399 and RK3288
platforms.

Signed-off-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
[hverkuil-cisco@xs4all.nl: fix checkpatch.pl alignment warning]
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 7f22507b

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -12841,6 +12841,13 @@ S: Maintained 
F:	drivers/media/platform/rockchip/rga/

F:	Documentation/devicetree/bindings/media/rockchip-rga.txt



ROCKCHIP VPU CODEC DRIVER

M:	Ezequiel Garcia <ezequiel@collabora.com>

L:	linux-media@vger.kernel.org

S:	Maintained

F:	drivers/staging/media/platform/rockchip/vpu/

F:	Documentation/devicetree/bindings/media/rockchip-vpu.txt



ROCKER DRIVER

M:	Jiri Pirko <jiri@resnulli.us>

L:	netdev@vger.kernel.org

drivers/staging/media/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ source "drivers/staging/media/mt9t031/Kconfig" 


source "drivers/staging/media/omap4iss/Kconfig"



source "drivers/staging/media/rockchip/vpu/Kconfig"



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



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

drivers/staging/media/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -8,3 +8,4 @@ obj-$(CONFIG_VIDEO_OMAP4) += omap4iss/ 
obj-$(CONFIG_VIDEO_SUNXI)	+= sunxi/

obj-$(CONFIG_TEGRA_VDE)		+= tegra-vde/

obj-$(CONFIG_VIDEO_ZORAN)	+= zoran/

obj-$(CONFIG_VIDEO_ROCKCHIP_VPU) += rockchip/vpu/

drivers/staging/media/rockchip/vpu/Kconfig

0 → 100644
+13 −0
Original line number Diff line number Diff line 
config VIDEO_ROCKCHIP_VPU

	tristate "Rockchip VPU driver"

	depends on ARCH_ROCKCHIP || COMPILE_TEST

	depends on VIDEO_DEV && VIDEO_V4L2 && MEDIA_CONTROLLER

	select VIDEOBUF2_DMA_CONTIG

	select VIDEOBUF2_VMALLOC

	select V4L2_MEM2MEM_DEV

	default n

	help

	  Support for the Video Processing Unit present on Rockchip SoC,

	  which accelerates video and image encoding and decoding.

	  To compile this driver as a module, choose M here: the module

	  will be called rockchip-vpu.

drivers/staging/media/rockchip/vpu/Makefile

0 → 100644
+10 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_VIDEO_ROCKCHIP_VPU) += rockchip-vpu.o



rockchip-vpu-y += \

		rockchip_vpu_drv.o \

		rockchip_vpu_enc.o \

		rk3288_vpu_hw.o \

		rk3288_vpu_hw_jpeg_enc.o \

		rk3399_vpu_hw.o \

		rk3399_vpu_hw_jpeg_enc.o \

		rockchip_vpu_jpeg.o