Revert "drm: Make drivers depends on DRM_DW_HDMI"

This reverts commit c0e0f139354c01e0213204e4a96e7076e5a3e396, 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/bd93d43b07f8ed6368119f4a5ddac2ee80debe53.1713780345.git.geert+renesas@glider.be
Signed-off-by: Maxime Ripard <mripard@kernel.org>

diff --git a/drivers/gpu/drm/bridge/imx/Kconfig b/drivers/gpu/drm/bridge/imx/Kconfig
index 13142a6b8590508015efa5b0484ad1a73a669e9e..8dd89efa8ea7d9e44976a64a83219fe48fd0543c 100644 (file)
--- a/drivers/gpu/drm/bridge/imx/Kconfig
+++ b/drivers/gpu/drm/bridge/imx/Kconfig
@@ -5,9 +5,9 @@ config DRM_IMX_LDB_HELPER
 
 config DRM_IMX8MP_DW_HDMI_BRIDGE
        tristate "Freescale i.MX8MP HDMI-TX bridge support"
-       depends on COMMON_CLK
-       depends on DRM_DW_HDMI
        depends on OF
+       depends on COMMON_CLK
+       select DRM_DW_HDMI
        imply DRM_IMX8MP_HDMI_PVI
        imply PHY_FSL_SAMSUNG_HDMI_PHY
        help

diff --git a/drivers/gpu/drm/imx/ipuv3/Kconfig b/drivers/gpu/drm/imx/ipuv3/Kconfig
index 5d810ac02171d9c5a7dc6ef821921332d9734644..bacf0655ebaf3f5f3db28ea139f5076b2c6f0187 100644 (file)
--- a/drivers/gpu/drm/imx/ipuv3/Kconfig
+++ b/drivers/gpu/drm/imx/ipuv3/Kconfig
@@ -35,8 +35,7 @@ config DRM_IMX_LDB
 
 config DRM_IMX_HDMI
        tristate "Freescale i.MX DRM HDMI"
-       depends on DRM_DW_HDMI
-       depends on DRM_IMX
-       depends on OF
+       select DRM_DW_HDMI
+       depends on DRM_IMX && OF
        help
          Choose this if you want to use HDMI on i.MX6.

diff --git a/drivers/gpu/drm/ingenic/Kconfig b/drivers/gpu/drm/ingenic/Kconfig
index 23effeb2ac721749f8a92ff07172774b9ea1674d..3db117c5edd9161b83d85dd1d195856902de2648 100644 (file)
--- a/drivers/gpu/drm/ingenic/Kconfig
+++ b/drivers/gpu/drm/ingenic/Kconfig
@@ -27,8 +27,8 @@ config DRM_INGENIC_IPU
 
 config DRM_INGENIC_DW_HDMI
        tristate "Ingenic specific support for Synopsys DW HDMI"
-       depends on DRM_DW_HDMI
        depends on MACH_JZ4780
+       select DRM_DW_HDMI
        help
          Choose this option to enable Synopsys DesignWare HDMI based driver.
          If you want to enable HDMI on Ingenic JZ4780 based SoC, you should

diff --git a/drivers/gpu/drm/meson/Kconfig b/drivers/gpu/drm/meson/Kconfig
index 5520b9e3f0107c4d3945b84c8695275848ab9111..615fdd0ce41b433aa288ff56005c889119ea84c1 100644 (file)
--- a/drivers/gpu/drm/meson/Kconfig
+++ b/drivers/gpu/drm/meson/Kconfig
@@ -13,9 +13,9 @@ config DRM_MESON
 
 config DRM_MESON_DW_HDMI
        tristate "HDMI Synopsys Controller support for Amlogic Meson Display"
-       depends on DRM_DW_HDMI
        depends on DRM_MESON
        default y if DRM_MESON
+       select DRM_DW_HDMI
        imply DRM_DW_HDMI_I2S_AUDIO
 
 config DRM_MESON_DW_MIPI_DSI

diff --git a/drivers/gpu/drm/renesas/rcar-du/Kconfig b/drivers/gpu/drm/renesas/rcar-du/Kconfig
index 2dc739db2ba33b998d7c8fd3093f87e2de441cf9..53c356aed5d52070e5de13355305bf5aefaa4d44 100644 (file)
--- a/drivers/gpu/drm/renesas/rcar-du/Kconfig
+++ b/drivers/gpu/drm/renesas/rcar-du/Kconfig
@@ -25,8 +25,8 @@ config DRM_RCAR_CMM
 config DRM_RCAR_DW_HDMI
        tristate "R-Car Gen3 and RZ/G2 DU HDMI Encoder Support"
        depends on DRM && OF
-       depends on DRM_DW_HDMI
        depends on DRM_RCAR_DU || COMPILE_TEST
+       select DRM_DW_HDMI
        help
          Enable support for R-Car Gen3 or RZ/G2 internal HDMI encoder.
 

diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig
index 0d5260e10f272d3b72b5052ea83d5efc01d9e75c..1bf3e2829cd07b6b0023a2f1e4ca6d75846fb44e 100644 (file)
--- a/drivers/gpu/drm/rockchip/Kconfig
+++ b/drivers/gpu/drm/rockchip/Kconfig
@@ -7,6 +7,7 @@ config DRM_ROCKCHIP
        select DRM_PANEL
        select VIDEOMODE_HELPERS
        select DRM_ANALOGIX_DP if ROCKCHIP_ANALOGIX_DP
+       select DRM_DW_HDMI if ROCKCHIP_DW_HDMI
        select DRM_DW_MIPI_DSI if ROCKCHIP_DW_MIPI_DSI
        select GENERIC_PHY if ROCKCHIP_DW_MIPI_DSI
        select GENERIC_PHY_MIPI_DPHY if ROCKCHIP_DW_MIPI_DSI
@@ -56,7 +57,6 @@ config ROCKCHIP_CDN_DP
 
 config ROCKCHIP_DW_HDMI
        bool "Rockchip specific extensions for Synopsys DW HDMI"
-       depends on DRM_DW_HDMI
        help
          This selects support for Rockchip SoC specific extensions
          for the Synopsys DesignWare HDMI driver. If you want to

diff --git a/drivers/gpu/drm/sun4i/Kconfig b/drivers/gpu/drm/sun4i/Kconfig
index 5b19c7cb7b7ebf53428d5d5bb751a285f49ca204..4741d9f6544c201b699d57385a1ddbc826bf84ce 100644 (file)
--- a/drivers/gpu/drm/sun4i/Kconfig
+++ b/drivers/gpu/drm/sun4i/Kconfig
@@ -57,8 +57,8 @@ config DRM_SUN6I_DSI
 config DRM_SUN8I_DW_HDMI
        tristate "Support for Allwinner version of DesignWare HDMI"
        depends on DRM_SUN4I
-       depends on DRM_DW_HDMI
        default DRM_SUN4I
+       select DRM_DW_HDMI
        help
          Choose this option if you have an Allwinner SoC with the
          DesignWare HDMI controller. SoCs that support HDMI and