Skip to content

Commit 4d15125

Browse files
mripardmripard
committed
drm: Switch DRM_DISPLAY_DP_AUX_BUS to depends on
Most of our helpers have relied on being selected so far through Kconfig, but that creates issues when we have multiple layers of helpers with some depending on others. Indeed, select doesn't select a dependency's dependencies, and thus isn't super intuitive. Depends on however doesn't have that limitation, so we can just switch all the drivers that were selecting DRM_DISPLAY_DP_AUX_BUS to depend on it. Reviewed-by: Jani Nikula <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Maxime Ripard <[email protected]>
1 parent e075e49 commit 4d15125

File tree

7 files changed

+10
-9
lines changed

7 files changed

+10
-9
lines changed

‎drivers/gpu/drm/bridge/Kconfig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ config DRM_FSL_LDB
9292

9393
config DRM_ITE_IT6505
9494
tristate "ITE IT6505 DisplayPort bridge"
95+
depends on DRM_DISPLAY_DP_AUX_BUS
9596
depends on DRM_DISPLAY_HELPER
9697
depends on OF
9798
select DRM_DISPLAY_DP_HELPER
9899
select DRM_DISPLAY_HDCP_HELPER
99-
select DRM_DISPLAY_DP_AUX_BUS
100100
select DRM_KMS_HELPER
101101
select DRM_DP_HELPER
102102
select EXTCON
@@ -226,10 +226,10 @@ config DRM_PARADE_PS8622
226226

227227
config DRM_PARADE_PS8640
228228
tristate "Parade PS8640 MIPI DSI to eDP Converter"
229+
depends on DRM_DISPLAY_DP_AUX_BUS
229230
depends on DRM_DISPLAY_HELPER
230231
depends on OF
231232
select DRM_DISPLAY_DP_HELPER
232-
select DRM_DISPLAY_DP_AUX_BUS
233233
select DRM_KMS_HELPER
234234
select DRM_MIPI_DSI
235235
select DRM_PANEL
@@ -381,6 +381,7 @@ config DRM_TI_SN65DSI83
381381

382382
config DRM_TI_SN65DSI86
383383
tristate "TI SN65DSI86 DSI to eDP bridge"
384+
depends on DRM_DISPLAY_DP_AUX_BUS
384385
depends on DRM_DISPLAY_HELPER
385386
depends on OF
386387
select DRM_DISPLAY_DP_HELPER
@@ -389,7 +390,6 @@ config DRM_TI_SN65DSI86
389390
select DRM_PANEL
390391
select DRM_MIPI_DSI
391392
select AUXILIARY_BUS
392-
select DRM_DISPLAY_DP_AUX_BUS
393393
help
394394
Texas Instruments SN65DSI86 DSI to eDP Bridge driver
395395

‎drivers/gpu/drm/bridge/analogix/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ config DRM_ANALOGIX_DP
3333
config DRM_ANALOGIX_ANX7625
3434
tristate "Analogix Anx7625 MIPI to DP interface support"
3535
depends on DRM
36+
depends on DRM_DISPLAY_DP_AUX_BUS
3637
depends on DRM_DISPLAY_HELPER
3738
depends on OF
3839
select DRM_DISPLAY_DP_HELPER
3940
select DRM_DISPLAY_HDCP_HELPER
40-
select DRM_DISPLAY_DP_AUX_BUS
4141
select DRM_MIPI_DSI
4242
help
4343
ANX7625 is an ultra-low power 4K mobile HD transmitter

‎drivers/gpu/drm/display/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ config DRM_DISPLAY_DP_AUX_BUS
1111
tristate "DRM DisplayPort AUX bus support"
1212
depends on DRM
1313
depends on OF || COMPILE_TEST
14+
default y
1415

1516
config DRM_DISPLAY_DP_AUX_CEC
1617
bool "Enable DisplayPort CEC-Tunneling-over-AUX HDMI support"

‎drivers/gpu/drm/mediatek/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ config DRM_MEDIATEK
2222

2323
config DRM_MEDIATEK_DP
2424
tristate "DRM DPTX Support for MediaTek SoCs"
25+
depends on DRM_DISPLAY_DP_AUX_BUS
2526
depends on DRM_DISPLAY_HELPER
2627
depends on DRM_MEDIATEK
2728
select PHY_MTK_DP
2829
select DRM_DISPLAY_DP_HELPER
29-
select DRM_DISPLAY_DP_AUX_BUS
3030
help
3131
DRM/KMS Display Port driver for MediaTek SoCs.
3232

‎drivers/gpu/drm/msm/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ config DRM_MSM
55
depends on ARCH_QCOM || SOC_IMX5 || COMPILE_TEST
66
depends on COMMON_CLK
77
depends on DRM
8+
depends on DRM_DISPLAY_DP_AUX_BUS
89
depends on DRM_DISPLAY_HELPER
910
depends on IOMMU_SUPPORT
1011
depends on QCOM_AOSS_QMP || QCOM_AOSS_QMP=n
@@ -15,7 +16,6 @@ config DRM_MSM
1516
select IOMMU_IO_PGTABLE
1617
select QCOM_MDT_LOADER if ARCH_QCOM
1718
select REGULATOR
18-
select DRM_DISPLAY_DP_AUX_BUS
1919
select DRM_DISPLAY_DP_HELPER
2020
select DRM_EXEC
2121
select DRM_KMS_HELPER

‎drivers/gpu/drm/panel/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -560,11 +560,11 @@ config DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01
560560
config DRM_PANEL_SAMSUNG_ATNA33XC20
561561
tristate "Samsung ATNA33XC20 eDP panel"
562562
depends on BACKLIGHT_CLASS_DEVICE
563+
depends on DRM_DISPLAY_DP_AUX_BUS
563564
depends on DRM_DISPLAY_HELPER
564565
depends on OF
565566
depends on PM
566567
select DRM_DISPLAY_DP_HELPER
567-
select DRM_DISPLAY_DP_AUX_BUS
568568
help
569569
DRM panel driver for the Samsung ATNA33XC20 panel. This panel can't
570570
be handled by the DRM_PANEL_SIMPLE driver because its power
@@ -800,12 +800,12 @@ config DRM_PANEL_STARTEK_KD070FHFID015
800800
config DRM_PANEL_EDP
801801
tristate "support for simple Embedded DisplayPort panels"
802802
depends on BACKLIGHT_CLASS_DEVICE
803+
depends on DRM_DISPLAY_DP_AUX_BUS
803804
depends on DRM_DISPLAY_HELPER
804805
depends on OF
805806
depends on PM
806807
select VIDEOMODE_HELPERS
807808
select DRM_DISPLAY_DP_HELPER
808-
select DRM_DISPLAY_DP_AUX_BUS
809809
select DRM_KMS_HELPER
810810
help
811811
DRM panel driver for dumb eDP panels that need at most a regulator and

‎drivers/gpu/drm/tegra/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ config DRM_TEGRA
44
depends on ARCH_TEGRA || COMPILE_TEST
55
depends on COMMON_CLK
66
depends on DRM
7+
depends on DRM_DISPLAY_DP_AUX_BUS
78
depends on DRM_DISPLAY_HELPER
89
depends on OF
910
select DRM_DISPLAY_DP_HELPER
1011
select DRM_DISPLAY_HDMI_HELPER
11-
select DRM_DISPLAY_DP_AUX_BUS
1212
select DRM_KMS_HELPER
1313
select DRM_MIPI_DSI
1414
select DRM_PANEL

0 commit comments

Comments
 (0)