Revert "drm: Switch DRM_DISPLAY_DP_HELPER to depends on"
This reverts commit 0323287de87d7e6e9c22c57d7440aa353a2298d0, 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/89ac456805746b6d0c888f10c5120b11aacd3319.1713780345.git.geert+renesas@glider.be Signed-off-by: Maxime Ripard <mripard@kernel.org>
This commit is contained in:
parent
9573446953
commit
7fe302ae19
@ -75,11 +75,11 @@ config DRM_KUNIT_TEST_HELPERS
|
||||
config DRM_KUNIT_TEST
|
||||
tristate "KUnit tests for DRM" if !KUNIT_ALL_TESTS
|
||||
depends on DRM
|
||||
depends on DRM_DISPLAY_DP_HELPER
|
||||
depends on DRM_DISPLAY_HELPER
|
||||
depends on KUNIT
|
||||
depends on MMU
|
||||
select DRM_BUDDY
|
||||
select DRM_DISPLAY_DP_HELPER
|
||||
select DRM_EXEC
|
||||
select DRM_EXPORT_FOR_TESTS if m
|
||||
select DRM_GEM_SHMEM_HELPER
|
||||
|
@ -3,12 +3,12 @@
|
||||
config DRM_AMDGPU
|
||||
tristate "AMD GPU"
|
||||
depends on DRM
|
||||
depends on DRM_DISPLAY_DP_HELPER
|
||||
depends on DRM_DISPLAY_HELPER
|
||||
depends on MMU
|
||||
depends on PCI
|
||||
depends on !UML
|
||||
select FW_LOADER
|
||||
select DRM_DISPLAY_DP_HELPER
|
||||
select DRM_DISPLAY_HDMI_HELPER
|
||||
select DRM_DISPLAY_HDCP_HELPER
|
||||
select DRM_KMS_HELPER
|
||||
|
@ -93,9 +93,9 @@ config DRM_FSL_LDB
|
||||
config DRM_ITE_IT6505
|
||||
tristate "ITE IT6505 DisplayPort bridge"
|
||||
depends on DRM_DISPLAY_DP_AUX_BUS
|
||||
depends on DRM_DISPLAY_DP_HELPER
|
||||
depends on DRM_DISPLAY_HELPER
|
||||
depends on OF
|
||||
select DRM_DISPLAY_DP_HELPER
|
||||
select DRM_DISPLAY_HDCP_HELPER
|
||||
select DRM_KMS_HELPER
|
||||
select EXTCON
|
||||
@ -233,9 +233,9 @@ config DRM_PARADE_PS8622
|
||||
config DRM_PARADE_PS8640
|
||||
tristate "Parade PS8640 MIPI DSI to eDP Converter"
|
||||
depends on DRM_DISPLAY_DP_AUX_BUS
|
||||
depends on DRM_DISPLAY_DP_HELPER
|
||||
depends on DRM_DISPLAY_HELPER
|
||||
depends on OF
|
||||
select DRM_DISPLAY_DP_HELPER
|
||||
select DRM_KMS_HELPER
|
||||
select DRM_MIPI_DSI
|
||||
select DRM_PANEL
|
||||
@ -319,9 +319,9 @@ config DRM_TOSHIBA_TC358764
|
||||
|
||||
config DRM_TOSHIBA_TC358767
|
||||
tristate "Toshiba TC358767 eDP bridge"
|
||||
depends on DRM_DISPLAY_DP_HELPER
|
||||
depends on DRM_DISPLAY_HELPER
|
||||
depends on OF
|
||||
select DRM_DISPLAY_DP_HELPER
|
||||
select DRM_KMS_HELPER
|
||||
select REGMAP_I2C
|
||||
select DRM_MIPI_DSI
|
||||
@ -342,9 +342,9 @@ config DRM_TOSHIBA_TC358768
|
||||
|
||||
config DRM_TOSHIBA_TC358775
|
||||
tristate "Toshiba TC358775 DSI/LVDS bridge"
|
||||
depends on DRM_DISPLAY_DP_HELPER
|
||||
depends on DRM_DISPLAY_HELPER
|
||||
depends on OF
|
||||
select DRM_DISPLAY_DP_HELPER
|
||||
select DRM_KMS_HELPER
|
||||
select REGMAP_I2C
|
||||
select DRM_PANEL
|
||||
@ -388,9 +388,9 @@ config DRM_TI_SN65DSI83
|
||||
config DRM_TI_SN65DSI86
|
||||
tristate "TI SN65DSI86 DSI to eDP bridge"
|
||||
depends on DRM_DISPLAY_DP_AUX_BUS
|
||||
depends on DRM_DISPLAY_DP_HELPER
|
||||
depends on DRM_DISPLAY_HELPER
|
||||
depends on OF
|
||||
select DRM_DISPLAY_DP_HELPER
|
||||
select DRM_KMS_HELPER
|
||||
select REGMAP_I2C
|
||||
select DRM_PANEL
|
||||
|
@ -1,10 +1,10 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
config DRM_ANALOGIX_ANX6345
|
||||
tristate "Analogix ANX6345 bridge"
|
||||
depends on DRM_DISPLAY_DP_HELPER
|
||||
depends on DRM_DISPLAY_HELPER
|
||||
depends on OF
|
||||
select DRM_ANALOGIX_DP
|
||||
select DRM_DISPLAY_DP_HELPER
|
||||
select DRM_KMS_HELPER
|
||||
select REGMAP_I2C
|
||||
help
|
||||
@ -15,9 +15,9 @@ config DRM_ANALOGIX_ANX6345
|
||||
|
||||
config DRM_ANALOGIX_ANX78XX
|
||||
tristate "Analogix ANX78XX bridge"
|
||||
depends on DRM_DISPLAY_DP_HELPER
|
||||
depends on DRM_DISPLAY_HELPER
|
||||
select DRM_ANALOGIX_DP
|
||||
select DRM_DISPLAY_DP_HELPER
|
||||
select DRM_KMS_HELPER
|
||||
select REGMAP_I2C
|
||||
help
|
||||
@ -34,9 +34,9 @@ config DRM_ANALOGIX_ANX7625
|
||||
tristate "Analogix Anx7625 MIPI to DP interface support"
|
||||
depends on DRM
|
||||
depends on DRM_DISPLAY_DP_AUX_BUS
|
||||
depends on DRM_DISPLAY_DP_HELPER
|
||||
depends on DRM_DISPLAY_HELPER
|
||||
depends on OF
|
||||
select DRM_DISPLAY_DP_HELPER
|
||||
select DRM_DISPLAY_HDCP_HELPER
|
||||
select DRM_MIPI_DSI
|
||||
help
|
||||
|
@ -23,9 +23,9 @@ endif
|
||||
|
||||
config DRM_CDNS_MHDP8546
|
||||
tristate "Cadence DPI/DP bridge"
|
||||
depends on DRM_DISPLAY_DP_HELPER
|
||||
depends on DRM_DISPLAY_HELPER
|
||||
depends on OF
|
||||
select DRM_DISPLAY_DP_HELPER
|
||||
select DRM_DISPLAY_HDCP_HELPER
|
||||
select DRM_KMS_HELPER
|
||||
select DRM_PANEL_BRIDGE
|
||||
|
@ -39,7 +39,6 @@ config DRM_DISPLAY_DP_AUX_CHARDEV
|
||||
config DRM_DISPLAY_DP_HELPER
|
||||
bool "DRM DisplayPort Helpers"
|
||||
depends on DRM_DISPLAY_HELPER
|
||||
default y
|
||||
help
|
||||
DRM display helpers for DisplayPort.
|
||||
|
||||
|
@ -67,9 +67,9 @@ config DRM_EXYNOS_DSI
|
||||
config DRM_EXYNOS_DP
|
||||
bool "Exynos specific extensions for Analogix DP driver"
|
||||
depends on DRM_EXYNOS_FIMD || DRM_EXYNOS7_DECON
|
||||
depends on DRM_DISPLAY_DP_HELPER
|
||||
depends on DRM_DISPLAY_HELPER
|
||||
select DRM_ANALOGIX_DP
|
||||
select DRM_DISPLAY_DP_HELPER
|
||||
default DRM_EXYNOS
|
||||
select DRM_PANEL
|
||||
help
|
||||
|
@ -2,7 +2,6 @@
|
||||
config DRM_I915
|
||||
tristate "Intel 8xx/9xx/G3x/G4x/HD Graphics"
|
||||
depends on DRM
|
||||
depends on DRM_DISPLAY_DP_HELPER
|
||||
depends on DRM_DISPLAY_HELPER
|
||||
depends on X86 && PCI
|
||||
depends on !PREEMPT_RT
|
||||
@ -12,6 +11,7 @@ config DRM_I915
|
||||
# the shmem_readpage() which depends upon tmpfs
|
||||
select SHMEM
|
||||
select TMPFS
|
||||
select DRM_DISPLAY_DP_HELPER
|
||||
select DRM_DISPLAY_HDCP_HELPER
|
||||
select DRM_DISPLAY_HDMI_HELPER
|
||||
select DRM_KMS_HELPER
|
||||
|
@ -23,10 +23,10 @@ config DRM_MEDIATEK
|
||||
config DRM_MEDIATEK_DP
|
||||
tristate "DRM DPTX Support for MediaTek SoCs"
|
||||
depends on DRM_DISPLAY_DP_AUX_BUS
|
||||
depends on DRM_DISPLAY_DP_HELPER
|
||||
depends on DRM_DISPLAY_HELPER
|
||||
depends on DRM_MEDIATEK
|
||||
select PHY_MTK_DP
|
||||
select DRM_DISPLAY_DP_HELPER
|
||||
help
|
||||
DRM/KMS Display Port driver for MediaTek SoCs.
|
||||
|
||||
|
@ -6,7 +6,6 @@ config DRM_MSM
|
||||
depends on COMMON_CLK
|
||||
depends on DRM
|
||||
depends on DRM_DISPLAY_DP_AUX_BUS
|
||||
depends on DRM_DISPLAY_DP_HELPER
|
||||
depends on DRM_DISPLAY_HELPER
|
||||
depends on IOMMU_SUPPORT
|
||||
depends on QCOM_AOSS_QMP || QCOM_AOSS_QMP=n
|
||||
@ -17,6 +16,7 @@ config DRM_MSM
|
||||
select IOMMU_IO_PGTABLE
|
||||
select QCOM_MDT_LOADER if ARCH_QCOM
|
||||
select REGULATOR
|
||||
select DRM_DISPLAY_DP_HELPER
|
||||
select DRM_EXEC
|
||||
select DRM_KMS_HELPER
|
||||
select DRM_PANEL
|
||||
|
@ -2,12 +2,12 @@
|
||||
config DRM_NOUVEAU
|
||||
tristate "Nouveau (NVIDIA) cards"
|
||||
depends on DRM
|
||||
depends on DRM_DISPLAY_DP_HELPER
|
||||
depends on DRM_DISPLAY_HELPER
|
||||
depends on PCI
|
||||
depends on MMU
|
||||
select IOMMU_API
|
||||
select FW_LOADER
|
||||
select DRM_DISPLAY_DP_HELPER
|
||||
select DRM_DISPLAY_HDMI_HELPER
|
||||
select DRM_KMS_HELPER
|
||||
select DRM_TTM
|
||||
|
@ -545,10 +545,10 @@ config DRM_PANEL_RAYDIUM_RM68200
|
||||
config DRM_PANEL_RAYDIUM_RM692E5
|
||||
tristate "Raydium RM692E5-based DSI panel"
|
||||
depends on BACKLIGHT_CLASS_DEVICE
|
||||
depends on DRM_DISPLAY_DP_HELPER
|
||||
depends on DRM_DISPLAY_HELPER
|
||||
depends on DRM_MIPI_DSI
|
||||
depends on OF
|
||||
select DRM_DISPLAY_DP_HELPER
|
||||
help
|
||||
Say Y here if you want to enable support for Raydium RM692E5-based
|
||||
display panels, such as the one found in the Fairphone 5 smartphone.
|
||||
@ -584,10 +584,10 @@ config DRM_PANEL_SAMSUNG_ATNA33XC20
|
||||
tristate "Samsung ATNA33XC20 eDP panel"
|
||||
depends on BACKLIGHT_CLASS_DEVICE
|
||||
depends on DRM_DISPLAY_DP_AUX_BUS
|
||||
depends on DRM_DISPLAY_DP_HELPER
|
||||
depends on DRM_DISPLAY_HELPER
|
||||
depends on OF
|
||||
depends on PM
|
||||
select DRM_DISPLAY_DP_HELPER
|
||||
help
|
||||
DRM panel driver for the Samsung ATNA33XC20 panel. This panel can't
|
||||
be handled by the DRM_PANEL_SIMPLE driver because its power
|
||||
@ -824,11 +824,11 @@ config DRM_PANEL_EDP
|
||||
tristate "support for simple Embedded DisplayPort panels"
|
||||
depends on BACKLIGHT_CLASS_DEVICE
|
||||
depends on DRM_DISPLAY_DP_AUX_BUS
|
||||
depends on DRM_DISPLAY_DP_HELPER
|
||||
depends on DRM_DISPLAY_HELPER
|
||||
depends on OF
|
||||
depends on PM
|
||||
select VIDEOMODE_HELPERS
|
||||
select DRM_DISPLAY_DP_HELPER
|
||||
select DRM_KMS_HELPER
|
||||
help
|
||||
DRM panel driver for dumb eDP panels that need at most a regulator and
|
||||
@ -903,10 +903,10 @@ config DRM_PANEL_TRULY_NT35597_WQXGA
|
||||
config DRM_PANEL_VISIONOX_R66451
|
||||
tristate "Visionox R66451"
|
||||
depends on BACKLIGHT_CLASS_DEVICE
|
||||
depends on DRM_DISPLAY_DP_HELPER
|
||||
depends on DRM_DISPLAY_HELPER
|
||||
depends on DRM_MIPI_DSI
|
||||
depends on OF
|
||||
select DRM_DISPLAY_DP_HELPER
|
||||
help
|
||||
Say Y here if you want to enable support for Visionox
|
||||
R66451 1080x2340 AMOLED DSI panel.
|
||||
|
@ -4,11 +4,11 @@ config DRM_RADEON
|
||||
tristate "ATI Radeon"
|
||||
depends on AGP || !AGP
|
||||
depends on DRM
|
||||
depends on DRM_DISPLAY_DP_HELPER
|
||||
depends on DRM_DISPLAY_HELPER
|
||||
depends on PCI
|
||||
depends on MMU
|
||||
select FW_LOADER
|
||||
select DRM_DISPLAY_DP_HELPER
|
||||
select DRM_KMS_HELPER
|
||||
select DRM_SUBALLOC_HELPER
|
||||
select DRM_TTM
|
||||
|
@ -35,9 +35,9 @@ config ROCKCHIP_VOP2
|
||||
|
||||
config ROCKCHIP_ANALOGIX_DP
|
||||
bool "Rockchip specific extensions for Analogix DP driver"
|
||||
depends on DRM_DISPLAY_DP_HELPER
|
||||
depends on DRM_DISPLAY_HELPER
|
||||
depends on ROCKCHIP_VOP
|
||||
select DRM_DISPLAY_DP_HELPER
|
||||
help
|
||||
This selects support for Rockchip SoC specific extensions
|
||||
for the Analogix Core DP driver. If you want to enable DP
|
||||
@ -45,9 +45,9 @@ config ROCKCHIP_ANALOGIX_DP
|
||||
|
||||
config ROCKCHIP_CDN_DP
|
||||
bool "Rockchip cdn DP"
|
||||
depends on DRM_DISPLAY_DP_HELPER
|
||||
depends on DRM_DISPLAY_HELPER
|
||||
depends on EXTCON=y || (EXTCON=m && DRM_ROCKCHIP=m)
|
||||
select DRM_DISPLAY_DP_HELPER
|
||||
help
|
||||
This selects support for Rockchip SoC specific extensions
|
||||
for the cdn DP driver. If you want to enable Dp on
|
||||
|
@ -5,9 +5,9 @@ config DRM_TEGRA
|
||||
depends on COMMON_CLK
|
||||
depends on DRM
|
||||
depends on DRM_DISPLAY_DP_AUX_BUS
|
||||
depends on DRM_DISPLAY_DP_HELPER
|
||||
depends on DRM_DISPLAY_HELPER
|
||||
depends on OF
|
||||
select DRM_DISPLAY_DP_HELPER
|
||||
select DRM_DISPLAY_HDMI_HELPER
|
||||
select DRM_KMS_HELPER
|
||||
select DRM_MIPI_DSI
|
||||
|
@ -3,7 +3,6 @@ config DRM_XE
|
||||
tristate "Intel Xe Graphics"
|
||||
depends on (m || (y && KUNIT=y))
|
||||
depends on DRM
|
||||
depends on DRM_DISPLAY_DP_HELPER
|
||||
depends on DRM_DISPLAY_HELPER
|
||||
depends on MMU
|
||||
depends on PCI
|
||||
@ -18,6 +17,7 @@ config DRM_XE
|
||||
select DRM_KUNIT_TEST_HELPERS if DRM_XE_KUNIT_TEST != n
|
||||
select DRM_PANEL
|
||||
select DRM_SUBALLOC_HELPER
|
||||
select DRM_DISPLAY_DP_HELPER
|
||||
select DRM_DISPLAY_HDCP_HELPER
|
||||
select DRM_DISPLAY_HDMI_HELPER
|
||||
select DRM_MIPI_DSI
|
||||
|
@ -4,12 +4,12 @@ config DRM_ZYNQMP_DPSUB
|
||||
depends on COMMON_CLK
|
||||
depends on DMADEVICES
|
||||
depends on DRM
|
||||
depends on DRM_DISPLAY_DP_HELPER
|
||||
depends on DRM_DISPLAY_HELPER
|
||||
depends on OF
|
||||
depends on PHY_XILINX_ZYNQMP
|
||||
depends on XILINX_ZYNQMP_DPDMA
|
||||
select DMA_ENGINE
|
||||
select DRM_DISPLAY_DP_HELPER
|
||||
select DRM_GEM_DMA_HELPER
|
||||
select DRM_KMS_HELPER
|
||||
select GENERIC_PHY
|
||||
|
Loading…
x
Reference in New Issue
Block a user