Commit 90204a38 authored by Jai Luthra's avatar Jai Luthra Committed by Greg Kroah-Hartman
Browse files

staging: vc04_services: Drop bcm2835-camera driver 



The bcm2835-camera driver is replaced by the V4L2 bcm2835-unicam driver
that is already upstream. So drop it from staging.

This also simplifies destaging of VCHIQ MMAL, by reducing the users of
the MMAL API (this driver is one of them).

Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarJai Luthra <jai.luthra@ideasonboard.com>
Acked-by: default avatarStefan Wahren <wahrenst@gmx.net>
Link: https://patch.msgid.link/20251029-vchiq-destage-v3-1-da8d6c83c2c5@ideasonboard.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 23413fe1

drivers/staging/vc04_services/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -48,8 +48,6 @@ endif 


source "drivers/staging/vc04_services/bcm2835-audio/Kconfig"



source "drivers/staging/vc04_services/bcm2835-camera/Kconfig"



source "drivers/staging/vc04_services/vchiq-mmal/Kconfig"



endif

drivers/staging/vc04_services/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -12,6 +12,5 @@ vchiq-objs += interface/vchiq_arm/vchiq_dev.o 
endif



obj-$(CONFIG_SND_BCM2835)		+= bcm2835-audio/

obj-$(CONFIG_VIDEO_BCM2835)		+= bcm2835-camera/

obj-$(CONFIG_BCM2835_VCHIQ_MMAL)	+= vchiq-mmal/

drivers/staging/vc04_services/bcm2835-camera/Kconfig

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

config VIDEO_BCM2835

	tristate "BCM2835 Camera"

	depends on MEDIA_SUPPORT

	depends on VIDEO_DEV && (ARCH_BCM2835 || COMPILE_TEST)

	select BCM2835_VCHIQ if HAS_DMA

	select BCM2835_VCHIQ_MMAL if HAS_DMA

	select VIDEOBUF2_VMALLOC

	select BTREE

	help

	  Say Y here to enable camera host interface devices for

	  Broadcom BCM2835 SoC. This operates over the VCHIQ interface

	  to a service running on VideoCore.

drivers/staging/vc04_services/bcm2835-camera/Makefile

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

bcm2835-v4l2-$(CONFIG_VIDEO_BCM2835) := \

	bcm2835-camera.o \

	controls.o



obj-$(CONFIG_VIDEO_BCM2835) += bcm2835-v4l2.o

drivers/staging/vc04_services/bcm2835-camera/TODO

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
1) Support dma-buf memory management.



In order to zero-copy import camera images into the 3D or display

pipelines, we need to export our buffers through dma-buf so that the

vc4 driver can import them.  This may involve bringing in the VCSM

driver (which allows long-term management of regions of memory in the

space that the VPU reserved and Linux otherwise doesn't have access

to), or building some new protocol that allows VCSM-style management

of Linux's CMA memory.



2) Avoid extra copies for padding of images.



We expose V4L2_PIX_FMT_* formats that have a specified stride/height

padding in the V4L2 spec, but that padding doesn't match what the

hardware can do.  If we exposed the native padding requirements

through the V4L2 "multiplanar" formats, the firmware would have one

less copy it needed to do.