Revert "drm: Switch DRM_DISPLAY_HDMI_HELPER to depends on"

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

diff --git a/drivers/gpu/drm/amd/amdgpu/Kconfig b/drivers/gpu/drm/amd/amdgpu/Kconfig
index b0365cc1374ee50aa08fd9e44c27fcef48b79261..1662dc49f18ed11e051b10b59c0db5c9c3ca950c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/Kconfig
+++ b/drivers/gpu/drm/amd/amdgpu/Kconfig
@@ -5,12 +5,12 @@ config DRM_AMDGPU
        depends on DRM
        depends on DRM_DISPLAY_DP_HELPER
        depends on DRM_DISPLAY_HDCP_HELPER
-       depends on DRM_DISPLAY_HDMI_HELPER
        depends on DRM_DISPLAY_HELPER
        depends on MMU
        depends on PCI
        depends on !UML
        select FW_LOADER
+       select DRM_DISPLAY_HDMI_HELPER
        select DRM_KMS_HELPER
        select DRM_SCHED
        select DRM_TTM

diff --git a/drivers/gpu/drm/bridge/synopsys/Kconfig b/drivers/gpu/drm/bridge/synopsys/Kconfig
index 387f5bd86089fb5cae619791202fdfde90f4f6b9..f366ece471462a7061f32049a058b09c38236dd9 100644 (file)
--- a/drivers/gpu/drm/bridge/synopsys/Kconfig
+++ b/drivers/gpu/drm/bridge/synopsys/Kconfig
@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config DRM_DW_HDMI
        tristate
-       depends on DRM_DISPLAY_HDMI_HELPER
        depends on DRM_DISPLAY_HELPER
+       select DRM_DISPLAY_HDMI_HELPER
        select DRM_KMS_HELPER
        select REGMAP_MMIO
        select CEC_CORE if CEC_NOTIFIER

diff --git a/drivers/gpu/drm/display/Kconfig b/drivers/gpu/drm/display/Kconfig
index 01f2a231aa5f04bde19a282c44e7d99ce240cd1d..d65f1a37c08c7cf8f4e1e41c3ea22d01ea95b444 100644 (file)
--- a/drivers/gpu/drm/display/Kconfig
+++ b/drivers/gpu/drm/display/Kconfig
@@ -74,6 +74,5 @@ config DRM_DISPLAY_HDCP_HELPER
 config DRM_DISPLAY_HDMI_HELPER
        bool "DRM HDMI Helpers"
        depends on DRM_DISPLAY_HELPER
-       default y
        help
          DRM display helpers for HDMI.

diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
index 4f0d18a16b0f4f991ddebb5ec16f4f844261a6cb..87ef8c4d72a53768a40a5f6474bb5e92495fc6a3 100644 (file)
--- a/drivers/gpu/drm/i915/Kconfig
+++ b/drivers/gpu/drm/i915/Kconfig
@@ -4,7 +4,6 @@ config DRM_I915
        depends on DRM
        depends on DRM_DISPLAY_DP_HELPER
        depends on DRM_DISPLAY_HDCP_HELPER
-       depends on DRM_DISPLAY_HDMI_HELPER
        depends on DRM_DISPLAY_HELPER
        depends on X86 && PCI
        depends on !PREEMPT_RT
@@ -14,6 +13,7 @@ config DRM_I915
        # the shmem_readpage() which depends upon tmpfs
        select SHMEM
        select TMPFS
+       select DRM_DISPLAY_HDMI_HELPER
        select DRM_KMS_HELPER
        select DRM_PANEL
        select DRM_MIPI_DSI

diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
index 4c10b400658c519ccdc24615a328603c9c7c0549..7cc305b2826d6abc8b5c1a2c8baf0c67fb456cb8 100644 (file)
--- a/drivers/gpu/drm/nouveau/Kconfig
+++ b/drivers/gpu/drm/nouveau/Kconfig
@@ -3,12 +3,12 @@ config DRM_NOUVEAU
        tristate "Nouveau (NVIDIA) cards"
        depends on DRM
        depends on DRM_DISPLAY_DP_HELPER
-       depends on DRM_DISPLAY_HDMI_HELPER
        depends on DRM_DISPLAY_HELPER
        depends on PCI
        depends on MMU
        select IOMMU_API
        select FW_LOADER
+       select DRM_DISPLAY_HDMI_HELPER
        select DRM_KMS_HELPER
        select DRM_TTM
        select DRM_TTM_HELPER

diff --git a/drivers/gpu/drm/tegra/Kconfig b/drivers/gpu/drm/tegra/Kconfig
index 6974caa99ece94e101373eef89abce3644293db0..bb6e35261f1144b1a50b60f84a65159f9da5daa6 100644 (file)
--- a/drivers/gpu/drm/tegra/Kconfig
+++ b/drivers/gpu/drm/tegra/Kconfig
@@ -6,9 +6,9 @@ config DRM_TEGRA
        depends on DRM
        depends on DRM_DISPLAY_DP_AUX_BUS
        depends on DRM_DISPLAY_DP_HELPER
-       depends on DRM_DISPLAY_HDMI_HELPER
        depends on DRM_DISPLAY_HELPER
        depends on OF
+       select DRM_DISPLAY_HDMI_HELPER
        select DRM_KMS_HELPER
        select DRM_MIPI_DSI
        select DRM_PANEL

diff --git a/drivers/gpu/drm/vc4/Kconfig b/drivers/gpu/drm/vc4/Kconfig
index 4801f8b64d3d70cdb1bf243cfe3305ac81557630..98772a6b5bf0df54738db2e63f156bebab03c0a4 100644 (file)
--- a/drivers/gpu/drm/vc4/Kconfig
+++ b/drivers/gpu/drm/vc4/Kconfig
@@ -4,13 +4,13 @@ config DRM_VC4
        depends on ARCH_BCM || ARCH_BCM2835 || COMPILE_TEST
        depends on COMMON_CLK
        depends on DRM
-       depends on DRM_DISPLAY_HDMI_HELPER
        depends on DRM_DISPLAY_HELPER
        depends on PM
        # Make sure not 'y' when RASPBERRYPI_FIRMWARE is 'm'. This can only
        # happen when COMPILE_TEST=y, hence the added !RASPBERRYPI_FIRMWARE.
        depends on RASPBERRYPI_FIRMWARE || (COMPILE_TEST && !RASPBERRYPI_FIRMWARE)
        depends on SND && SND_SOC
+       select DRM_DISPLAY_HDMI_HELPER
        select DRM_KMS_HELPER
        select DRM_GEM_DMA_HELPER
        select DRM_PANEL_BRIDGE

diff --git a/drivers/gpu/drm/xe/Kconfig b/drivers/gpu/drm/xe/Kconfig
index 782934be0a773bcb1e8a10e53a78e93e124a46d9..ce2f6635ff74317b1aa86fa65c606f86c53a5a69 100644 (file)
--- a/drivers/gpu/drm/xe/Kconfig
+++ b/drivers/gpu/drm/xe/Kconfig
@@ -5,7 +5,6 @@ config DRM_XE
        depends on DRM
        depends on DRM_DISPLAY_DP_HELPER
        depends on DRM_DISPLAY_HDCP_HELPER
-       depends on DRM_DISPLAY_HDMI_HELPER
        depends on DRM_DISPLAY_HELPER
        depends on MMU
        depends on PCI
@@ -20,6 +19,7 @@ config DRM_XE
        select DRM_KUNIT_TEST_HELPERS if DRM_XE_KUNIT_TEST != n
        select DRM_PANEL
        select DRM_SUBALLOC_HELPER
+       select DRM_DISPLAY_HDMI_HELPER
        select DRM_MIPI_DSI
        select RELAY
        select IRQ_WORK