Revert "drm/display: Make all helpers visible and switch to depends on"

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

diff --git a/drivers/gpu/drm/display/Kconfig b/drivers/gpu/drm/display/Kconfig
index c77e7f85bd674dc91fca9fc93e2bedc7467a9022..864a6488bfdf14997c9c1876f9785c893f1960a8 100644 (file)
--- a/drivers/gpu/drm/display/Kconfig
+++ b/drivers/gpu/drm/display/Kconfig
@@ -1,21 +1,20 @@
 # SPDX-License-Identifier: MIT
 
 config DRM_DISPLAY_HELPER
-       tristate "DRM Display Helpers"
+       tristate
        depends on DRM
        help
          DRM helpers for display adapters.
 
 config DRM_DISPLAY_DP_AUX_BUS
-       tristate "DRM DisplayPort AUX bus support"
+       tristate
        depends on DRM
        depends on OF || COMPILE_TEST
 
 config DRM_DISPLAY_DP_AUX_CEC
        bool "Enable DisplayPort CEC-Tunneling-over-AUX HDMI support"
-       depends on DRM
-       depends on DRM_DISPLAY_HELPER
-       depends on DRM_DISPLAY_DP_HELPER
+       depends on DRM && DRM_DISPLAY_HELPER
+       select DRM_DISPLAY_DP_HELPER
        select CEC_CORE
        help
          Choose this option if you want to enable HDMI CEC support for
@@ -25,24 +24,23 @@ config DRM_DISPLAY_DP_AUX_CEC
          that do support this they often do not hook up the CEC pin.
 
 config DRM_DISPLAY_DP_AUX_CHARDEV
-       bool "DRM DisplayPort AUX Interface"
-       depends on DRM
-       depends on DRM_DISPLAY_HELPER
-       depends on DRM_DISPLAY_DP_HELPER
+       bool "DRM DP AUX Interface"
+       depends on DRM && DRM_DISPLAY_HELPER
+       select DRM_DISPLAY_DP_HELPER
        help
          Choose this option to enable a /dev/drm_dp_auxN node that allows to
          read and write values to arbitrary DPCD registers on the DP aux
          channel.
 
 config DRM_DISPLAY_DP_HELPER
-       bool "DRM DisplayPort Helpers"
+       bool
        depends on DRM_DISPLAY_HELPER
        help
          DRM display helpers for DisplayPort.
 
 config DRM_DISPLAY_DP_TUNNEL
-       bool "DRM DisplayPort tunnels support"
-       depends on DRM_DISPLAY_DP_HELPER
+       bool
+       select DRM_DISPLAY_DP_HELPER
        help
          Enable support for DisplayPort tunnels. This allows drivers to use
          DP tunnel features like the Bandwidth Allocation mode to maximize the
@@ -62,13 +60,13 @@ config DRM_DISPLAY_DP_TUNNEL_STATE_DEBUG
          If in doubt, say "N".
 
 config DRM_DISPLAY_HDCP_HELPER
-       bool "DRM HDCD Helpers"
+       bool
        depends on DRM_DISPLAY_HELPER
        help
          DRM display helpers for HDCP.
 
 config DRM_DISPLAY_HDMI_HELPER
-       bool "DRM HDMI Helpers"
+       bool
        depends on DRM_DISPLAY_HELPER
        help
          DRM display helpers for HDMI.