Skip to content

Commit 1e0b9b4

Browse files
geertumripard
geertu
authored and
mripard
committed
Revert "drm: Switch DRM_DISPLAY_DP_AUX_BUS to depends on"
This reverts commit 4d15125, 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 <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/79824fec01eb9ab0673b9409f9b39cc8b5cc338d.1713780345.git.geert+renesas@glider.be Signed-off-by: Maxime Ripard <[email protected]>
1 parent 7fe302a commit 1e0b9b4

File tree

7 files changed

+9
-10
lines changed

7 files changed

+9
-10
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
9695
depends on DRM_DISPLAY_HELPER
9796
depends on OF
9897
select DRM_DISPLAY_DP_HELPER
9998
select DRM_DISPLAY_HDCP_HELPER
99+
select DRM_DISPLAY_DP_AUX_BUS
100100
select DRM_KMS_HELPER
101101
select EXTCON
102102
select CRYPTO
@@ -232,10 +232,10 @@ config DRM_PARADE_PS8622
232232

233233
config DRM_PARADE_PS8640
234234
tristate "Parade PS8640 MIPI DSI to eDP Converter"
235-
depends on DRM_DISPLAY_DP_AUX_BUS
236235
depends on DRM_DISPLAY_HELPER
237236
depends on OF
238237
select DRM_DISPLAY_DP_HELPER
238+
select DRM_DISPLAY_DP_AUX_BUS
239239
select DRM_KMS_HELPER
240240
select DRM_MIPI_DSI
241241
select DRM_PANEL
@@ -387,7 +387,6 @@ config DRM_TI_SN65DSI83
387387

388388
config DRM_TI_SN65DSI86
389389
tristate "TI SN65DSI86 DSI to eDP bridge"
390-
depends on DRM_DISPLAY_DP_AUX_BUS
391390
depends on DRM_DISPLAY_HELPER
392391
depends on OF
393392
select DRM_DISPLAY_DP_HELPER
@@ -396,6 +395,7 @@ config DRM_TI_SN65DSI86
396395
select DRM_PANEL
397396
select DRM_MIPI_DSI
398397
select AUXILIARY_BUS
398+
select DRM_DISPLAY_DP_AUX_BUS
399399
help
400400
Texas Instruments SN65DSI86 DSI to eDP Bridge driver
401401

‎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
3736
depends on DRM_DISPLAY_HELPER
3837
depends on OF
3938
select DRM_DISPLAY_DP_HELPER
4039
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: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ 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
1514

1615
config DRM_DISPLAY_DP_AUX_CEC
1716
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
2625
depends on DRM_DISPLAY_HELPER
2726
depends on DRM_MEDIATEK
2827
select PHY_MTK_DP
2928
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,7 +5,6 @@ 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
98
depends on DRM_DISPLAY_HELPER
109
depends on IOMMU_SUPPORT
1110
depends on QCOM_AOSS_QMP || QCOM_AOSS_QMP=n
@@ -16,6 +15,7 @@ config DRM_MSM
1615
select IOMMU_IO_PGTABLE
1716
select QCOM_MDT_LOADER if ARCH_QCOM
1817
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
@@ -583,11 +583,11 @@ config DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01
583583
config DRM_PANEL_SAMSUNG_ATNA33XC20
584584
tristate "Samsung ATNA33XC20 eDP panel"
585585
depends on BACKLIGHT_CLASS_DEVICE
586-
depends on DRM_DISPLAY_DP_AUX_BUS
587586
depends on DRM_DISPLAY_HELPER
588587
depends on OF
589588
depends on PM
590589
select DRM_DISPLAY_DP_HELPER
590+
select DRM_DISPLAY_DP_AUX_BUS
591591
help
592592
DRM panel driver for the Samsung ATNA33XC20 panel. This panel can't
593593
be handled by the DRM_PANEL_SIMPLE driver because its power
@@ -823,12 +823,12 @@ config DRM_PANEL_STARTEK_KD070FHFID015
823823
config DRM_PANEL_EDP
824824
tristate "support for simple Embedded DisplayPort panels"
825825
depends on BACKLIGHT_CLASS_DEVICE
826-
depends on DRM_DISPLAY_DP_AUX_BUS
827826
depends on DRM_DISPLAY_HELPER
828827
depends on OF
829828
depends on PM
830829
select VIDEOMODE_HELPERS
831830
select DRM_DISPLAY_DP_HELPER
831+
select DRM_DISPLAY_DP_AUX_BUS
832832
select DRM_KMS_HELPER
833833
help
834834
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
87
depends on DRM_DISPLAY_HELPER
98
depends on OF
109
select DRM_DISPLAY_DP_HELPER
1110
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)