Revert "drm: Switch DRM_DISPLAY_HDMI_HELPER to depends on"
This reverts commit f6d2dc03fa
, as helper
code should always be selected by the driver that needs it, for the
convenience of the final user configuring a kernel.
The user who configures a kernel should not need to know which helpers
are needed for the driver he is interested in. Making a driver depend
on helper code means that the user needs to know which helpers to enable
first, which is very user-unfriendly.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Link: https://patchwork.freedesktop.org/patch/msgid/bd288a5943dab8609f2d1f2bf413595a61df727a.1713780345.git.geert+renesas@glider.be
Signed-off-by: Maxime Ripard <mripard@kernel.org>
This commit is contained in:
parent
d738adc2d9
commit
d7c128cb77
8 changed files with 7 additions and 8 deletions
|
@ -5,12 +5,12 @@ config DRM_AMDGPU
|
||||||
depends on DRM
|
depends on DRM
|
||||||
depends on DRM_DISPLAY_DP_HELPER
|
depends on DRM_DISPLAY_DP_HELPER
|
||||||
depends on DRM_DISPLAY_HDCP_HELPER
|
depends on DRM_DISPLAY_HDCP_HELPER
|
||||||
depends on DRM_DISPLAY_HDMI_HELPER
|
|
||||||
depends on DRM_DISPLAY_HELPER
|
depends on DRM_DISPLAY_HELPER
|
||||||
depends on MMU
|
depends on MMU
|
||||||
depends on PCI
|
depends on PCI
|
||||||
depends on !UML
|
depends on !UML
|
||||||
select FW_LOADER
|
select FW_LOADER
|
||||||
|
select DRM_DISPLAY_HDMI_HELPER
|
||||||
select DRM_KMS_HELPER
|
select DRM_KMS_HELPER
|
||||||
select DRM_SCHED
|
select DRM_SCHED
|
||||||
select DRM_TTM
|
select DRM_TTM
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# SPDX-License-Identifier: GPL-2.0-only
|
# SPDX-License-Identifier: GPL-2.0-only
|
||||||
config DRM_DW_HDMI
|
config DRM_DW_HDMI
|
||||||
tristate
|
tristate
|
||||||
depends on DRM_DISPLAY_HDMI_HELPER
|
|
||||||
depends on DRM_DISPLAY_HELPER
|
depends on DRM_DISPLAY_HELPER
|
||||||
|
select DRM_DISPLAY_HDMI_HELPER
|
||||||
select DRM_KMS_HELPER
|
select DRM_KMS_HELPER
|
||||||
select REGMAP_MMIO
|
select REGMAP_MMIO
|
||||||
select CEC_CORE if CEC_NOTIFIER
|
select CEC_CORE if CEC_NOTIFIER
|
||||||
|
|
|
@ -74,6 +74,5 @@ config DRM_DISPLAY_HDCP_HELPER
|
||||||
config DRM_DISPLAY_HDMI_HELPER
|
config DRM_DISPLAY_HDMI_HELPER
|
||||||
bool "DRM HDMI Helpers"
|
bool "DRM HDMI Helpers"
|
||||||
depends on DRM_DISPLAY_HELPER
|
depends on DRM_DISPLAY_HELPER
|
||||||
default y
|
|
||||||
help
|
help
|
||||||
DRM display helpers for HDMI.
|
DRM display helpers for HDMI.
|
||||||
|
|
|
@ -4,7 +4,6 @@ config DRM_I915
|
||||||
depends on DRM
|
depends on DRM
|
||||||
depends on DRM_DISPLAY_DP_HELPER
|
depends on DRM_DISPLAY_DP_HELPER
|
||||||
depends on DRM_DISPLAY_HDCP_HELPER
|
depends on DRM_DISPLAY_HDCP_HELPER
|
||||||
depends on DRM_DISPLAY_HDMI_HELPER
|
|
||||||
depends on DRM_DISPLAY_HELPER
|
depends on DRM_DISPLAY_HELPER
|
||||||
depends on X86 && PCI
|
depends on X86 && PCI
|
||||||
depends on !PREEMPT_RT
|
depends on !PREEMPT_RT
|
||||||
|
@ -14,6 +13,7 @@ config DRM_I915
|
||||||
# the shmem_readpage() which depends upon tmpfs
|
# the shmem_readpage() which depends upon tmpfs
|
||||||
select SHMEM
|
select SHMEM
|
||||||
select TMPFS
|
select TMPFS
|
||||||
|
select DRM_DISPLAY_HDMI_HELPER
|
||||||
select DRM_KMS_HELPER
|
select DRM_KMS_HELPER
|
||||||
select DRM_PANEL
|
select DRM_PANEL
|
||||||
select DRM_MIPI_DSI
|
select DRM_MIPI_DSI
|
||||||
|
|
|
@ -3,12 +3,12 @@ config DRM_NOUVEAU
|
||||||
tristate "Nouveau (NVIDIA) cards"
|
tristate "Nouveau (NVIDIA) cards"
|
||||||
depends on DRM
|
depends on DRM
|
||||||
depends on DRM_DISPLAY_DP_HELPER
|
depends on DRM_DISPLAY_DP_HELPER
|
||||||
depends on DRM_DISPLAY_HDMI_HELPER
|
|
||||||
depends on DRM_DISPLAY_HELPER
|
depends on DRM_DISPLAY_HELPER
|
||||||
depends on PCI
|
depends on PCI
|
||||||
depends on MMU
|
depends on MMU
|
||||||
select IOMMU_API
|
select IOMMU_API
|
||||||
select FW_LOADER
|
select FW_LOADER
|
||||||
|
select DRM_DISPLAY_HDMI_HELPER
|
||||||
select DRM_KMS_HELPER
|
select DRM_KMS_HELPER
|
||||||
select DRM_TTM
|
select DRM_TTM
|
||||||
select DRM_TTM_HELPER
|
select DRM_TTM_HELPER
|
||||||
|
|
|
@ -6,9 +6,9 @@ config DRM_TEGRA
|
||||||
depends on DRM
|
depends on DRM
|
||||||
depends on DRM_DISPLAY_DP_AUX_BUS
|
depends on DRM_DISPLAY_DP_AUX_BUS
|
||||||
depends on DRM_DISPLAY_DP_HELPER
|
depends on DRM_DISPLAY_DP_HELPER
|
||||||
depends on DRM_DISPLAY_HDMI_HELPER
|
|
||||||
depends on DRM_DISPLAY_HELPER
|
depends on DRM_DISPLAY_HELPER
|
||||||
depends on OF
|
depends on OF
|
||||||
|
select DRM_DISPLAY_HDMI_HELPER
|
||||||
select DRM_KMS_HELPER
|
select DRM_KMS_HELPER
|
||||||
select DRM_MIPI_DSI
|
select DRM_MIPI_DSI
|
||||||
select DRM_PANEL
|
select DRM_PANEL
|
||||||
|
|
|
@ -4,13 +4,13 @@ config DRM_VC4
|
||||||
depends on ARCH_BCM || ARCH_BCM2835 || COMPILE_TEST
|
depends on ARCH_BCM || ARCH_BCM2835 || COMPILE_TEST
|
||||||
depends on COMMON_CLK
|
depends on COMMON_CLK
|
||||||
depends on DRM
|
depends on DRM
|
||||||
depends on DRM_DISPLAY_HDMI_HELPER
|
|
||||||
depends on DRM_DISPLAY_HELPER
|
depends on DRM_DISPLAY_HELPER
|
||||||
depends on PM
|
depends on PM
|
||||||
# Make sure not 'y' when RASPBERRYPI_FIRMWARE is 'm'. This can only
|
# Make sure not 'y' when RASPBERRYPI_FIRMWARE is 'm'. This can only
|
||||||
# happen when COMPILE_TEST=y, hence the added !RASPBERRYPI_FIRMWARE.
|
# happen when COMPILE_TEST=y, hence the added !RASPBERRYPI_FIRMWARE.
|
||||||
depends on RASPBERRYPI_FIRMWARE || (COMPILE_TEST && !RASPBERRYPI_FIRMWARE)
|
depends on RASPBERRYPI_FIRMWARE || (COMPILE_TEST && !RASPBERRYPI_FIRMWARE)
|
||||||
depends on SND && SND_SOC
|
depends on SND && SND_SOC
|
||||||
|
select DRM_DISPLAY_HDMI_HELPER
|
||||||
select DRM_KMS_HELPER
|
select DRM_KMS_HELPER
|
||||||
select DRM_GEM_DMA_HELPER
|
select DRM_GEM_DMA_HELPER
|
||||||
select DRM_PANEL_BRIDGE
|
select DRM_PANEL_BRIDGE
|
||||||
|
|
|
@ -5,7 +5,6 @@ config DRM_XE
|
||||||
depends on DRM
|
depends on DRM
|
||||||
depends on DRM_DISPLAY_DP_HELPER
|
depends on DRM_DISPLAY_DP_HELPER
|
||||||
depends on DRM_DISPLAY_HDCP_HELPER
|
depends on DRM_DISPLAY_HDCP_HELPER
|
||||||
depends on DRM_DISPLAY_HDMI_HELPER
|
|
||||||
depends on DRM_DISPLAY_HELPER
|
depends on DRM_DISPLAY_HELPER
|
||||||
depends on MMU
|
depends on MMU
|
||||||
depends on PCI
|
depends on PCI
|
||||||
|
@ -20,6 +19,7 @@ config DRM_XE
|
||||||
select DRM_KUNIT_TEST_HELPERS if DRM_XE_KUNIT_TEST != n
|
select DRM_KUNIT_TEST_HELPERS if DRM_XE_KUNIT_TEST != n
|
||||||
select DRM_PANEL
|
select DRM_PANEL
|
||||||
select DRM_SUBALLOC_HELPER
|
select DRM_SUBALLOC_HELPER
|
||||||
|
select DRM_DISPLAY_HDMI_HELPER
|
||||||
select DRM_MIPI_DSI
|
select DRM_MIPI_DSI
|
||||||
select RELAY
|
select RELAY
|
||||||
select IRQ_WORK
|
select IRQ_WORK
|
||||||
|
|
Loading…
Add table
Reference in a new issue