Unverified Commit 05b8b6dd authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Maxime Ripard
Browse files

Revert "drm: Switch DRM_DISPLAY_HELPER to depends on" 



This reverts commit e075e496, 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: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://patchwork.freedesktop.org/patch/msgid/1ba76cc4d96a8afefff5d1bc42fb1e1329c5da68.1713780345.git.geert+renesas@glider.be


Signed-off-by: default avatarMaxime Ripard <mripard@kernel.org>
parent 1e0b9b44

drivers/gpu/drm/Kconfig

+2 −4
Original line number Diff line number Diff line
@@ -74,12 +74,10 @@ config DRM_KUNIT_TEST_HELPERS 


config DRM_KUNIT_TEST

	tristate "KUnit tests for DRM" if !KUNIT_ALL_TESTS

	depends on DRM

	depends on DRM_DISPLAY_HELPER

	depends on KUNIT

	depends on MMU

	depends on DRM && KUNIT && MMU

	select DRM_BUDDY

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HELPER

	select DRM_EXEC

	select DRM_EXPORT_FOR_TESTS if m

	select DRM_GEM_SHMEM_HELPER

drivers/gpu/drm/amd/amdgpu/Kconfig

+2 −4
Original line number Diff line number Diff line
@@ -2,15 +2,13 @@ 


config DRM_AMDGPU

	tristate "AMD GPU"

	depends on DRM

	depends on DRM_DISPLAY_HELPER

	depends on MMU

	depends on PCI

	depends on DRM && PCI && MMU

	depends on !UML

	select FW_LOADER

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HDMI_HELPER

	select DRM_DISPLAY_HDCP_HELPER

	select DRM_DISPLAY_HELPER

	select DRM_KMS_HELPER

	select DRM_SCHED

	select DRM_TTM

drivers/gpu/drm/bridge/Kconfig

+5 −5
Original line number Diff line number Diff line
@@ -92,10 +92,10 @@ config DRM_FSL_LDB 


config DRM_ITE_IT6505

	tristate "ITE IT6505 DisplayPort bridge"

	depends on DRM_DISPLAY_HELPER

	depends on OF

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HDCP_HELPER

	select DRM_DISPLAY_HELPER

	select DRM_DISPLAY_DP_AUX_BUS

	select DRM_KMS_HELPER

	select EXTCON
@@ -232,9 +232,9 @@ config DRM_PARADE_PS8622 


config DRM_PARADE_PS8640

	tristate "Parade PS8640 MIPI DSI to eDP Converter"

	depends on DRM_DISPLAY_HELPER

	depends on OF

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HELPER

	select DRM_DISPLAY_DP_AUX_BUS

	select DRM_KMS_HELPER

	select DRM_MIPI_DSI
@@ -319,9 +319,9 @@ config DRM_TOSHIBA_TC358764 


config DRM_TOSHIBA_TC358767

	tristate "Toshiba TC358767 eDP bridge"

	depends on DRM_DISPLAY_HELPER

	depends on OF

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HELPER

	select DRM_KMS_HELPER

	select REGMAP_I2C

	select DRM_MIPI_DSI
@@ -342,9 +342,9 @@ config DRM_TOSHIBA_TC358768 


config DRM_TOSHIBA_TC358775

	tristate "Toshiba TC358775 DSI/LVDS bridge"

	depends on DRM_DISPLAY_HELPER

	depends on OF

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HELPER

	select DRM_KMS_HELPER

	select REGMAP_I2C

	select DRM_PANEL
@@ -387,9 +387,9 @@ config DRM_TI_SN65DSI83 


config DRM_TI_SN65DSI86

	tristate "TI SN65DSI86 DSI to eDP bridge"

	depends on DRM_DISPLAY_HELPER

	depends on OF

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HELPER

	select DRM_KMS_HELPER

	select REGMAP_I2C

	select DRM_PANEL

drivers/gpu/drm/bridge/analogix/Kconfig

+3 −3
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

config DRM_ANALOGIX_ANX6345

	tristate "Analogix ANX6345 bridge"

	depends on DRM_DISPLAY_HELPER

	depends on OF

	select DRM_ANALOGIX_DP

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HELPER

	select DRM_KMS_HELPER

	select REGMAP_I2C

	help
@@ -15,9 +15,9 @@ config DRM_ANALOGIX_ANX6345 


config DRM_ANALOGIX_ANX78XX

	tristate "Analogix ANX78XX bridge"

	depends on DRM_DISPLAY_HELPER

	select DRM_ANALOGIX_DP

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HELPER

	select DRM_KMS_HELPER

	select REGMAP_I2C

	help
@@ -33,10 +33,10 @@ config DRM_ANALOGIX_DP 
config DRM_ANALOGIX_ANX7625

	tristate "Analogix Anx7625 MIPI to DP interface support"

	depends on DRM

	depends on DRM_DISPLAY_HELPER

	depends on OF

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HDCP_HELPER

	select DRM_DISPLAY_HELPER

	select DRM_DISPLAY_DP_AUX_BUS

	select DRM_MIPI_DSI

	help

drivers/gpu/drm/bridge/cadence/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -23,12 +23,12 @@ endif 


config DRM_CDNS_MHDP8546

	tristate "Cadence DPI/DP bridge"

	depends on DRM_DISPLAY_HELPER

	depends on OF

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HDCP_HELPER

	select DRM_DISPLAY_HELPER

	select DRM_KMS_HELPER

	select DRM_PANEL_BRIDGE

	depends on OF

	help

	  Support Cadence DPI to DP bridge. This is an internal

	  bridge and is meant to be directly embedded in a SoC.