Commit 1e0b9b44 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Maxime Ripard

Revert "drm: Switch DRM_DISPLAY_DP_AUX_BUS to depends on"

This reverts commit 4d15125d, 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: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://patchwork.freedesktop.org/patch/msgid/79824fec01eb9ab0673b9409f9b39cc8b5cc338d.1713780345.git.geert+renesas@glider.beSigned-off-by: default avatarMaxime Ripard <mripard@kernel.org>
parent 7fe302ae
...@@ -92,11 +92,11 @@ config DRM_FSL_LDB ...@@ -92,11 +92,11 @@ config DRM_FSL_LDB
config DRM_ITE_IT6505 config DRM_ITE_IT6505
tristate "ITE IT6505 DisplayPort bridge" tristate "ITE IT6505 DisplayPort bridge"
depends on DRM_DISPLAY_DP_AUX_BUS
depends on DRM_DISPLAY_HELPER depends on DRM_DISPLAY_HELPER
depends on OF depends on OF
select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_DP_HELPER
select DRM_DISPLAY_HDCP_HELPER select DRM_DISPLAY_HDCP_HELPER
select DRM_DISPLAY_DP_AUX_BUS
select DRM_KMS_HELPER select DRM_KMS_HELPER
select EXTCON select EXTCON
select CRYPTO select CRYPTO
...@@ -232,10 +232,10 @@ config DRM_PARADE_PS8622 ...@@ -232,10 +232,10 @@ config DRM_PARADE_PS8622
config DRM_PARADE_PS8640 config DRM_PARADE_PS8640
tristate "Parade PS8640 MIPI DSI to eDP Converter" tristate "Parade PS8640 MIPI DSI to eDP Converter"
depends on DRM_DISPLAY_DP_AUX_BUS
depends on DRM_DISPLAY_HELPER depends on DRM_DISPLAY_HELPER
depends on OF depends on OF
select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_DP_HELPER
select DRM_DISPLAY_DP_AUX_BUS
select DRM_KMS_HELPER select DRM_KMS_HELPER
select DRM_MIPI_DSI select DRM_MIPI_DSI
select DRM_PANEL select DRM_PANEL
...@@ -387,7 +387,6 @@ config DRM_TI_SN65DSI83 ...@@ -387,7 +387,6 @@ config DRM_TI_SN65DSI83
config DRM_TI_SN65DSI86 config DRM_TI_SN65DSI86
tristate "TI SN65DSI86 DSI to eDP bridge" tristate "TI SN65DSI86 DSI to eDP bridge"
depends on DRM_DISPLAY_DP_AUX_BUS
depends on DRM_DISPLAY_HELPER depends on DRM_DISPLAY_HELPER
depends on OF depends on OF
select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_DP_HELPER
...@@ -396,6 +395,7 @@ config DRM_TI_SN65DSI86 ...@@ -396,6 +395,7 @@ config DRM_TI_SN65DSI86
select DRM_PANEL select DRM_PANEL
select DRM_MIPI_DSI select DRM_MIPI_DSI
select AUXILIARY_BUS select AUXILIARY_BUS
select DRM_DISPLAY_DP_AUX_BUS
help help
Texas Instruments SN65DSI86 DSI to eDP Bridge driver Texas Instruments SN65DSI86 DSI to eDP Bridge driver
......
...@@ -33,11 +33,11 @@ config DRM_ANALOGIX_DP ...@@ -33,11 +33,11 @@ config DRM_ANALOGIX_DP
config DRM_ANALOGIX_ANX7625 config DRM_ANALOGIX_ANX7625
tristate "Analogix Anx7625 MIPI to DP interface support" tristate "Analogix Anx7625 MIPI to DP interface support"
depends on DRM depends on DRM
depends on DRM_DISPLAY_DP_AUX_BUS
depends on DRM_DISPLAY_HELPER depends on DRM_DISPLAY_HELPER
depends on OF depends on OF
select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_DP_HELPER
select DRM_DISPLAY_HDCP_HELPER select DRM_DISPLAY_HDCP_HELPER
select DRM_DISPLAY_DP_AUX_BUS
select DRM_MIPI_DSI select DRM_MIPI_DSI
help help
ANX7625 is an ultra-low power 4K mobile HD transmitter ANX7625 is an ultra-low power 4K mobile HD transmitter
......
...@@ -11,7 +11,6 @@ config DRM_DISPLAY_DP_AUX_BUS ...@@ -11,7 +11,6 @@ config DRM_DISPLAY_DP_AUX_BUS
tristate "DRM DisplayPort AUX bus support" tristate "DRM DisplayPort AUX bus support"
depends on DRM depends on DRM
depends on OF || COMPILE_TEST depends on OF || COMPILE_TEST
default y
config DRM_DISPLAY_DP_AUX_CEC config DRM_DISPLAY_DP_AUX_CEC
bool "Enable DisplayPort CEC-Tunneling-over-AUX HDMI support" bool "Enable DisplayPort CEC-Tunneling-over-AUX HDMI support"
......
...@@ -22,11 +22,11 @@ config DRM_MEDIATEK ...@@ -22,11 +22,11 @@ config DRM_MEDIATEK
config DRM_MEDIATEK_DP config DRM_MEDIATEK_DP
tristate "DRM DPTX Support for MediaTek SoCs" tristate "DRM DPTX Support for MediaTek SoCs"
depends on DRM_DISPLAY_DP_AUX_BUS
depends on DRM_DISPLAY_HELPER depends on DRM_DISPLAY_HELPER
depends on DRM_MEDIATEK depends on DRM_MEDIATEK
select PHY_MTK_DP select PHY_MTK_DP
select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_DP_HELPER
select DRM_DISPLAY_DP_AUX_BUS
help help
DRM/KMS Display Port driver for MediaTek SoCs. DRM/KMS Display Port driver for MediaTek SoCs.
......
...@@ -5,7 +5,6 @@ config DRM_MSM ...@@ -5,7 +5,6 @@ config DRM_MSM
depends on ARCH_QCOM || SOC_IMX5 || COMPILE_TEST depends on ARCH_QCOM || SOC_IMX5 || COMPILE_TEST
depends on COMMON_CLK depends on COMMON_CLK
depends on DRM depends on DRM
depends on DRM_DISPLAY_DP_AUX_BUS
depends on DRM_DISPLAY_HELPER depends on DRM_DISPLAY_HELPER
depends on IOMMU_SUPPORT depends on IOMMU_SUPPORT
depends on QCOM_AOSS_QMP || QCOM_AOSS_QMP=n depends on QCOM_AOSS_QMP || QCOM_AOSS_QMP=n
...@@ -16,6 +15,7 @@ config DRM_MSM ...@@ -16,6 +15,7 @@ config DRM_MSM
select IOMMU_IO_PGTABLE select IOMMU_IO_PGTABLE
select QCOM_MDT_LOADER if ARCH_QCOM select QCOM_MDT_LOADER if ARCH_QCOM
select REGULATOR select REGULATOR
select DRM_DISPLAY_DP_AUX_BUS
select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_DP_HELPER
select DRM_EXEC select DRM_EXEC
select DRM_KMS_HELPER select DRM_KMS_HELPER
......
...@@ -583,11 +583,11 @@ config DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 ...@@ -583,11 +583,11 @@ config DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01
config DRM_PANEL_SAMSUNG_ATNA33XC20 config DRM_PANEL_SAMSUNG_ATNA33XC20
tristate "Samsung ATNA33XC20 eDP panel" tristate "Samsung ATNA33XC20 eDP panel"
depends on BACKLIGHT_CLASS_DEVICE depends on BACKLIGHT_CLASS_DEVICE
depends on DRM_DISPLAY_DP_AUX_BUS
depends on DRM_DISPLAY_HELPER depends on DRM_DISPLAY_HELPER
depends on OF depends on OF
depends on PM depends on PM
select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_DP_HELPER
select DRM_DISPLAY_DP_AUX_BUS
help help
DRM panel driver for the Samsung ATNA33XC20 panel. This panel can't DRM panel driver for the Samsung ATNA33XC20 panel. This panel can't
be handled by the DRM_PANEL_SIMPLE driver because its power be handled by the DRM_PANEL_SIMPLE driver because its power
...@@ -823,12 +823,12 @@ config DRM_PANEL_STARTEK_KD070FHFID015 ...@@ -823,12 +823,12 @@ config DRM_PANEL_STARTEK_KD070FHFID015
config DRM_PANEL_EDP config DRM_PANEL_EDP
tristate "support for simple Embedded DisplayPort panels" tristate "support for simple Embedded DisplayPort panels"
depends on BACKLIGHT_CLASS_DEVICE depends on BACKLIGHT_CLASS_DEVICE
depends on DRM_DISPLAY_DP_AUX_BUS
depends on DRM_DISPLAY_HELPER depends on DRM_DISPLAY_HELPER
depends on OF depends on OF
depends on PM depends on PM
select VIDEOMODE_HELPERS select VIDEOMODE_HELPERS
select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_DP_HELPER
select DRM_DISPLAY_DP_AUX_BUS
select DRM_KMS_HELPER select DRM_KMS_HELPER
help help
DRM panel driver for dumb eDP panels that need at most a regulator and DRM panel driver for dumb eDP panels that need at most a regulator and
......
...@@ -4,11 +4,11 @@ config DRM_TEGRA ...@@ -4,11 +4,11 @@ config DRM_TEGRA
depends on ARCH_TEGRA || COMPILE_TEST depends on ARCH_TEGRA || COMPILE_TEST
depends on COMMON_CLK depends on COMMON_CLK
depends on DRM depends on DRM
depends on DRM_DISPLAY_DP_AUX_BUS
depends on DRM_DISPLAY_HELPER depends on DRM_DISPLAY_HELPER
depends on OF depends on OF
select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_DP_HELPER
select DRM_DISPLAY_HDMI_HELPER select DRM_DISPLAY_HDMI_HELPER
select DRM_DISPLAY_DP_AUX_BUS
select DRM_KMS_HELPER select DRM_KMS_HELPER
select DRM_MIPI_DSI select DRM_MIPI_DSI
select DRM_PANEL select DRM_PANEL
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment