github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 22:14:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ANDROID: Re-enable menus hidden by disabling MEDIA_SUPPORT_FILTER

Browse Source 
A recent change upstream changed how MEDIA_SUPPORT_FILTER vs driver
autoselection worked, in a way that is negative for GKI. Either, you can
enable MEDIA_SUPPORT_FILTER and have implicit driver autoselection, OR
you can disable it to control more of the core media framework, but have
to manually *deselect* the drivers you don't want. This is untenable for
GKI as it will require us to stay on top of newly added DVB/TV/Radio
drivers added upstream, and we don't even want those subsystems right
now.

So, modify the bool/prompt menus back to regular bool Kconfig options
and drop the dependency on MEDIA_SUPPORT_FILTER. This still allows the
media core to be tweaked, but the drivers will all default off, instead
of on (=m).

Bug: 163582226
Change-Id: I87f72efbf6321c194982c0bff7a80d1d255522ae
Signed-off-by: Alistair Delva <adelva@google.com>
This commit is contained in:
Alistair Delva 2020-08-29 10:39:05 -07:00 committed by Greg Kroah-Hartman
parent dea1a925f6
commit 13c6a5e993
3 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm64/configs/gki_defconfig
View File

@ -334,10 +334,15 @@ CONFIG_MFD_ACT8945A=y
CONFIG_MFD_SYSCON=y CONFIG_MFD_SYSCON=y
CONFIG_REGULATOR=y CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_MEDIA_CEC_SUPPORT=y # CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
CONFIG_MEDIA_SUPPORT_FILTER=y # CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
CONFIG_MEDIA_CAMERA_SUPPORT=y # CONFIG_MEDIA_RADIO_SUPPORT is not set
CONFIG_MEDIA_PLATFORM_SUPPORT=y # CONFIG_MEDIA_SDR_SUPPORT is not set
# CONFIG_MEDIA_TEST_SUPPORT is not set
CONFIG_VIDEO_V4L2_SUBDEV_API=y
CONFIG_MEDIA_USB_SUPPORT=y
CONFIG_USB_VIDEO_CLASS=y
CONFIG_USB_GSPCA=y
CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_V4L_MEM2MEM_DRIVERS=y
# CONFIG_VGA_ARB is not set # CONFIG_VGA_ARB is not set

13
arch/x86/configs/gki_defconfig
View File

@ -289,10 +289,15 @@ CONFIG_WATCHDOG_CORE=y
CONFIG_MFD_SYSCON=y CONFIG_MFD_SYSCON=y
CONFIG_REGULATOR=y CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_MEDIA_CEC_SUPPORT=y # CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
CONFIG_MEDIA_SUPPORT_FILTER=y # CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
CONFIG_MEDIA_CAMERA_SUPPORT=y # CONFIG_MEDIA_RADIO_SUPPORT is not set
CONFIG_MEDIA_PLATFORM_SUPPORT=y # CONFIG_MEDIA_SDR_SUPPORT is not set
# CONFIG_MEDIA_TEST_SUPPORT is not set
CONFIG_VIDEO_V4L2_SUBDEV_API=y
CONFIG_MEDIA_USB_SUPPORT=y
CONFIG_USB_VIDEO_CLASS=y
CONFIG_USB_GSPCA=y
CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_DRM=y CONFIG_DRM=y

21
drivers/media/Kconfig
View File

@ -66,8 +66,7 @@ menu "Media device types"
# Multimedia support - automatically enable V4L2 and DVB core # Multimedia support - automatically enable V4L2 and DVB core
# #
config MEDIA_CAMERA_SUPPORT config MEDIA_CAMERA_SUPPORT
bool bool "Cameras and video grabbers"
prompt "Cameras and video grabbers" if MEDIA_SUPPORT_FILTER
default y if !MEDIA_SUPPORT_FILTER default y if !MEDIA_SUPPORT_FILTER
help help
Enable support for webcams and video grabbers. Enable support for webcams and video grabbers.
@ -75,8 +74,7 @@ config MEDIA_CAMERA_SUPPORT
Say Y when you have a webcam or a video capture grabber board. Say Y when you have a webcam or a video capture grabber board.
config MEDIA_ANALOG_TV_SUPPORT config MEDIA_ANALOG_TV_SUPPORT
bool bool "Analog TV"
prompt "Analog TV" if MEDIA_SUPPORT_FILTER
default y if !MEDIA_SUPPORT_FILTER default y if !MEDIA_SUPPORT_FILTER
help help
Enable analog TV support. Enable analog TV support.
@ -89,8 +87,7 @@ config MEDIA_ANALOG_TV_SUPPORT
will disable support for them. will disable support for them.
config MEDIA_DIGITAL_TV_SUPPORT config MEDIA_DIGITAL_TV_SUPPORT
bool bool "Digital TV"
prompt "Digital TV" if MEDIA_SUPPORT_FILTER
default y if !MEDIA_SUPPORT_FILTER default y if !MEDIA_SUPPORT_FILTER
help help
Enable digital TV support. Enable digital TV support.
@ -99,8 +96,7 @@ config MEDIA_DIGITAL_TV_SUPPORT
hybrid digital TV and analog TV. hybrid digital TV and analog TV.
config MEDIA_RADIO_SUPPORT config MEDIA_RADIO_SUPPORT
bool bool "AM/FM radio receivers/transmitters"
prompt "AM/FM radio receivers/transmitters" if MEDIA_SUPPORT_FILTER
default y if !MEDIA_SUPPORT_FILTER default y if !MEDIA_SUPPORT_FILTER
help help
Enable AM/FM radio support. Enable AM/FM radio support.
@ -115,8 +111,7 @@ config MEDIA_RADIO_SUPPORT
disable support for them. disable support for them.
config MEDIA_SDR_SUPPORT config MEDIA_SDR_SUPPORT
bool bool "Software defined radio"
prompt "Software defined radio" if MEDIA_SUPPORT_FILTER
default y if !MEDIA_SUPPORT_FILTER default y if !MEDIA_SUPPORT_FILTER
help help
Enable software defined radio support. Enable software defined radio support.
@ -124,8 +119,7 @@ config MEDIA_SDR_SUPPORT
Say Y when you have a software defined radio device. Say Y when you have a software defined radio device.
config MEDIA_PLATFORM_SUPPORT config MEDIA_PLATFORM_SUPPORT
bool bool "Platform-specific devices"
prompt "Platform-specific devices" if MEDIA_SUPPORT_FILTER
default y if !MEDIA_SUPPORT_FILTER default y if !MEDIA_SUPPORT_FILTER
help help
Enable support for complex cameras, codecs, and other hardware Enable support for complex cameras, codecs, and other hardware
@ -138,8 +132,7 @@ config MEDIA_PLATFORM_SUPPORT
Say Y when you want to be able so see such devices. Say Y when you want to be able so see such devices.
config MEDIA_TEST_SUPPORT config MEDIA_TEST_SUPPORT
bool bool "Test drivers"
prompt "Test drivers" if MEDIA_SUPPORT_FILTER
default y if !MEDIA_SUPPORT_FILTER default y if !MEDIA_SUPPORT_FILTER
help help
Those drivers should not be used on production Kernels, but Those drivers should not be used on production Kernels, but