Skip to content

Commit 8f7f115

Browse files
geertumripard
authored andcommitted
Revert "drm: Make drivers depends on DRM_DW_HDMI"
This reverts commit c0e0f13, 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/bd93d43b07f8ed6368119f4a5ddac2ee80debe53.1713780345.git.geert+renesas@glider.be Signed-off-by: Maxime Ripard <[email protected]>
1 parent 05b8b6d commit 8f7f115

File tree

7 files changed

+9
-10
lines changed

7 files changed

+9
-10
lines changed

drivers/gpu/drm/bridge/imx/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ config DRM_IMX_LDB_HELPER
55

66
config DRM_IMX8MP_DW_HDMI_BRIDGE
77
tristate "Freescale i.MX8MP HDMI-TX bridge support"
8-
depends on COMMON_CLK
9-
depends on DRM_DW_HDMI
108
depends on OF
9+
depends on COMMON_CLK
10+
select DRM_DW_HDMI
1111
imply DRM_IMX8MP_HDMI_PVI
1212
imply PHY_FSL_SAMSUNG_HDMI_PHY
1313
help

drivers/gpu/drm/imx/ipuv3/Kconfig

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ config DRM_IMX_LDB
3535

3636
config DRM_IMX_HDMI
3737
tristate "Freescale i.MX DRM HDMI"
38-
depends on DRM_DW_HDMI
39-
depends on DRM_IMX
40-
depends on OF
38+
select DRM_DW_HDMI
39+
depends on DRM_IMX && OF
4140
help
4241
Choose this if you want to use HDMI on i.MX6.

drivers/gpu/drm/ingenic/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ config DRM_INGENIC_IPU
2727

2828
config DRM_INGENIC_DW_HDMI
2929
tristate "Ingenic specific support for Synopsys DW HDMI"
30-
depends on DRM_DW_HDMI
3130
depends on MACH_JZ4780
31+
select DRM_DW_HDMI
3232
help
3333
Choose this option to enable Synopsys DesignWare HDMI based driver.
3434
If you want to enable HDMI on Ingenic JZ4780 based SoC, you should

drivers/gpu/drm/meson/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ config DRM_MESON
1313

1414
config DRM_MESON_DW_HDMI
1515
tristate "HDMI Synopsys Controller support for Amlogic Meson Display"
16-
depends on DRM_DW_HDMI
1716
depends on DRM_MESON
1817
default y if DRM_MESON
18+
select DRM_DW_HDMI
1919
imply DRM_DW_HDMI_I2S_AUDIO
2020

2121
config DRM_MESON_DW_MIPI_DSI

drivers/gpu/drm/renesas/rcar-du/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ config DRM_RCAR_CMM
2525
config DRM_RCAR_DW_HDMI
2626
tristate "R-Car Gen3 and RZ/G2 DU HDMI Encoder Support"
2727
depends on DRM && OF
28-
depends on DRM_DW_HDMI
2928
depends on DRM_RCAR_DU || COMPILE_TEST
29+
select DRM_DW_HDMI
3030
help
3131
Enable support for R-Car Gen3 or RZ/G2 internal HDMI encoder.
3232

drivers/gpu/drm/rockchip/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ config DRM_ROCKCHIP
77
select DRM_PANEL
88
select VIDEOMODE_HELPERS
99
select DRM_ANALOGIX_DP if ROCKCHIP_ANALOGIX_DP
10+
select DRM_DW_HDMI if ROCKCHIP_DW_HDMI
1011
select DRM_DW_MIPI_DSI if ROCKCHIP_DW_MIPI_DSI
1112
select GENERIC_PHY if ROCKCHIP_DW_MIPI_DSI
1213
select GENERIC_PHY_MIPI_DPHY if ROCKCHIP_DW_MIPI_DSI
@@ -56,7 +57,6 @@ config ROCKCHIP_CDN_DP
5657

5758
config ROCKCHIP_DW_HDMI
5859
bool "Rockchip specific extensions for Synopsys DW HDMI"
59-
depends on DRM_DW_HDMI
6060
help
6161
This selects support for Rockchip SoC specific extensions
6262
for the Synopsys DesignWare HDMI driver. If you want to

drivers/gpu/drm/sun4i/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ config DRM_SUN6I_DSI
5757
config DRM_SUN8I_DW_HDMI
5858
tristate "Support for Allwinner version of DesignWare HDMI"
5959
depends on DRM_SUN4I
60-
depends on DRM_DW_HDMI
6160
default DRM_SUN4I
61+
select DRM_DW_HDMI
6262
help
6363
Choose this option if you have an Allwinner SoC with the
6464
DesignWare HDMI controller. SoCs that support HDMI and

0 commit comments

Comments
 (0)