drm/bridge-connector: move to DRM_DISPLAY_HELPER module

drm_bridge_connector is a "leaf" driver, belonging to the display
helper, rather than the "CRTC" drm_kms_helper module. Move the driver
to the drm/display and add necessary Kconfig selection clauses.

Suggested-by: Maxime Ripard <mripard@kernel.org>
Acked-by: Maxime Ripard <mripard@kernel.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240903-drm-bridge-connector-fix-hdmi-reset-v5-2-daebde6d9857@linaro.org
Signed-off-by: Maxime Ripard <mripard@kernel.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 42decde3832066e43a460a83b0634e4d9af0c797..515e7f4b6cd92bcb90be4f7beb159e66ff34eb2a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7452,8 +7452,8 @@ S:        Maintained
 T:     git https://gitlab.freedesktop.org/drm/misc/kernel.git
 F:     Documentation/devicetree/bindings/display/bridge/
 F:     drivers/gpu/drm/bridge/
+F:     drivers/gpu/drm/display/drm_bridge_connector.c
 F:     drivers/gpu/drm/drm_bridge.c
-F:     drivers/gpu/drm/drm_bridge_connector.c
 F:     include/drm/drm_bridge.h
 F:     include/drm/drm_bridge_connector.h
 

diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 68cc9258ffc4b88041efc7f6ade13b827e46fba0..fa432a1ac9e2b7b2b1b9c6f3250441efc5d7ee1f 100644 (file)
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -128,7 +128,6 @@ obj-$(CONFIG_DRM_TTM_HELPER) += drm_ttm_helper.o
 drm_kms_helper-y := \
        drm_atomic_helper.o \
        drm_atomic_state_helper.o \
-       drm_bridge_connector.o \
        drm_crtc_helper.o \
        drm_damage_helper.o \
        drm_encoder_slave.o \

diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig
index c621be1a99a89c441f75ace64b113c1da1c19df3..3eb955333c809e23a8faece88db728d3dd119a79 100644 (file)
--- a/drivers/gpu/drm/bridge/Kconfig
+++ b/drivers/gpu/drm/bridge/Kconfig
@@ -390,6 +390,7 @@ config DRM_TI_SN65DSI86
        depends on OF
        select DRM_DISPLAY_DP_HELPER
        select DRM_DISPLAY_HELPER
+       select DRM_BRIDGE_CONNECTOR
        select DRM_KMS_HELPER
        select REGMAP_I2C
        select DRM_PANEL

diff --git a/drivers/gpu/drm/display/Kconfig b/drivers/gpu/drm/display/Kconfig
index e6fc253cb4b5bc0dd08ee91658169f9768ee479b..1d73fdef2a33e427049bfeed053aabfb9ce9fbae 100644 (file)
--- a/drivers/gpu/drm/display/Kconfig
+++ b/drivers/gpu/drm/display/Kconfig
@@ -13,6 +13,11 @@ config DRM_DISPLAY_HELPER
 
 if DRM_DISPLAY_HELPER
 
+config DRM_BRIDGE_CONNECTOR
+       bool
+       help
+         DRM connector implementation terminating DRM bridge chains.
+
 config DRM_DISPLAY_DP_AUX_CEC
        bool "Enable DisplayPort CEC-Tunneling-over-AUX HDMI support"
        select DRM_DISPLAY_DP_HELPER

diff --git a/drivers/gpu/drm/display/Makefile b/drivers/gpu/drm/display/Makefile
index 629df2f4d3221801baea5ba9d46f26faa72b0a54..fbb9d2b8acd41a84b5c8f6c2827aab779f432901 100644 (file)
--- a/drivers/gpu/drm/display/Makefile
+++ b/drivers/gpu/drm/display/Makefile
@@ -3,6 +3,8 @@
 obj-$(CONFIG_DRM_DISPLAY_DP_AUX_BUS) += drm_dp_aux_bus.o
 
 drm_display_helper-y := drm_display_helper_mod.o
+drm_display_helper-$(CONFIG_DRM_BRIDGE_CONNECTOR) += \
+       drm_bridge_connector.o
 drm_display_helper-$(CONFIG_DRM_DISPLAY_DP_HELPER) += \
        drm_dp_dual_mode_helper.o \
        drm_dp_helper.o \

diff --git a/drivers/gpu/drm/drm_bridge_connector.c b/drivers/gpu/drm/display/drm_bridge_connector.c
similarity index 100%
rename from drivers/gpu/drm/drm_bridge_connector.c
rename to drivers/gpu/drm/display/drm_bridge_connector.c

diff --git a/drivers/gpu/drm/imx/dcss/Kconfig b/drivers/gpu/drm/imx/dcss/Kconfig
index 3ffc061d392bbaee2a2d044c8308c74f5168fd45..59e3b6a1dff066733af22fa7827b31d8b912d15b 100644 (file)
--- a/drivers/gpu/drm/imx/dcss/Kconfig
+++ b/drivers/gpu/drm/imx/dcss/Kconfig
@@ -2,6 +2,8 @@ config DRM_IMX_DCSS
        tristate "i.MX8MQ DCSS"
        select IMX_IRQSTEER
        select DRM_KMS_HELPER
+       select DRM_DISPLAY_HELPER
+       select DRM_BRIDGE_CONNECTOR
        select DRM_GEM_DMA_HELPER
        select VIDEOMODE_HELPERS
        depends on DRM && ARCH_MXC && ARM64

diff --git a/drivers/gpu/drm/imx/lcdc/Kconfig b/drivers/gpu/drm/imx/lcdc/Kconfig
index 7e57922bbd9db3dacb7518b5cac650922ac41b3c..9c28bb0f4662f06b361b243146634b183951e2ad 100644 (file)
--- a/drivers/gpu/drm/imx/lcdc/Kconfig
+++ b/drivers/gpu/drm/imx/lcdc/Kconfig
@@ -3,5 +3,7 @@ config DRM_IMX_LCDC
       depends on DRM && (ARCH_MXC || COMPILE_TEST)
       select DRM_GEM_DMA_HELPER
       select DRM_KMS_HELPER
+      select DRM_DISPLAY_HELPER
+      select DRM_BRIDGE_CONNECTOR
       help
         Found on i.MX1, i.MX21, i.MX25 and i.MX27.

diff --git a/drivers/gpu/drm/ingenic/Kconfig b/drivers/gpu/drm/ingenic/Kconfig
index 3db117c5edd9161b83d85dd1d195856902de2648..8cd7b750dffe2d44b5461ad60428eb42996e9717 100644 (file)
--- a/drivers/gpu/drm/ingenic/Kconfig
+++ b/drivers/gpu/drm/ingenic/Kconfig
@@ -8,6 +8,8 @@ config DRM_INGENIC
        select DRM_BRIDGE
        select DRM_PANEL_BRIDGE
        select DRM_KMS_HELPER
+       select DRM_DISPLAY_HELPER
+       select DRM_BRIDGE_CONNECTOR
        select DRM_GEM_DMA_HELPER
        select REGMAP
        select REGMAP_MMIO

diff --git a/drivers/gpu/drm/kmb/Kconfig b/drivers/gpu/drm/kmb/Kconfig
index fd011367db1d41599c4bdcad4b1164e1fc75834d..e5ae3ec52392a02706167bfc7166f41658cb0801 100644 (file)
--- a/drivers/gpu/drm/kmb/Kconfig
+++ b/drivers/gpu/drm/kmb/Kconfig
@@ -3,6 +3,8 @@ config DRM_KMB_DISPLAY
        depends on DRM
        depends on ARCH_KEEMBAY || COMPILE_TEST
        select DRM_KMS_HELPER
+       select DRM_DISPLAY_HELPER
+       select DRM_BRIDGE_CONNECTOR
        select DRM_GEM_DMA_HELPER
        select DRM_MIPI_DSI
        help

diff --git a/drivers/gpu/drm/mediatek/Kconfig b/drivers/gpu/drm/mediatek/Kconfig
index d6449ebae838e263698ae645e942d7d78a545627..417ac8c9af4194eb6b7d405dbe62a2e2413f2cd8 100644 (file)
--- a/drivers/gpu/drm/mediatek/Kconfig
+++ b/drivers/gpu/drm/mediatek/Kconfig
@@ -9,6 +9,8 @@ config DRM_MEDIATEK
        depends on MTK_MMSYS
        select DRM_GEM_DMA_HELPER if DRM_FBDEV_EMULATION
        select DRM_KMS_HELPER
+       select DRM_DISPLAY_HELPER
+       select DRM_BRIDGE_CONNECTOR
        select DRM_MIPI_DSI
        select DRM_PANEL
        select MEMORY

diff --git a/drivers/gpu/drm/meson/Kconfig b/drivers/gpu/drm/meson/Kconfig
index 615fdd0ce41b433aa288ff56005c889119ea84c1..2544756538cc2d97d80f08c3df6fc06696391de3 100644 (file)
--- a/drivers/gpu/drm/meson/Kconfig
+++ b/drivers/gpu/drm/meson/Kconfig
@@ -4,6 +4,8 @@ config DRM_MESON
        depends on DRM && OF && (ARM || ARM64)
        depends on ARCH_MESON || COMPILE_TEST
        select DRM_KMS_HELPER
+       select DRM_DISPLAY_HELPER
+       select DRM_BRIDGE_CONNECTOR
        select DRM_GEM_DMA_HELPER
        select DRM_DISPLAY_CONNECTOR
        select VIDEOMODE_HELPERS

diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig
index 26a4c71da63aae0ca311fef71cbe0a8930b2edb7..90c68106b63b0ff3ef5c4c59ce20e1a536a1bfbf 100644 (file)
--- a/drivers/gpu/drm/msm/Kconfig
+++ b/drivers/gpu/drm/msm/Kconfig
@@ -17,6 +17,7 @@ config DRM_MSM
        select DRM_DISPLAY_DP_AUX_BUS
        select DRM_DISPLAY_DP_HELPER
        select DRM_DISPLAY_HELPER
+       select DRM_BRIDGE_CONNECTOR
        select DRM_EXEC
        select DRM_KMS_HELPER
        select DRM_PANEL

diff --git a/drivers/gpu/drm/omapdrm/Kconfig b/drivers/gpu/drm/omapdrm/Kconfig
index 64e440a2649b01cb1521dc7dd73b011464ac7061..fbd9af758581f8aa7793f81cb838e22556b55a6a 100644 (file)
--- a/drivers/gpu/drm/omapdrm/Kconfig
+++ b/drivers/gpu/drm/omapdrm/Kconfig
@@ -5,6 +5,8 @@ config DRM_OMAP
        depends on DRM && OF
        depends on ARCH_OMAP2PLUS || (COMPILE_TEST && PAGE_SIZE_LESS_THAN_64KB)
        select DRM_KMS_HELPER
+       select DRM_DISPLAY_HELPER
+       select DRM_BRIDGE_CONNECTOR
        select FB_DMAMEM_HELPERS_DEFERRED if DRM_FBDEV_EMULATION
        select VIDEOMODE_HELPERS
        select HDMI

diff --git a/drivers/gpu/drm/renesas/rcar-du/Kconfig b/drivers/gpu/drm/renesas/rcar-du/Kconfig
index c17e7c50492c50f843b4576a0375bd28deb0fb96..025677fe88d3badffefe59f9042ff7e3d851abcf 100644 (file)
--- a/drivers/gpu/drm/renesas/rcar-du/Kconfig
+++ b/drivers/gpu/drm/renesas/rcar-du/Kconfig
@@ -5,6 +5,8 @@ config DRM_RCAR_DU
        depends on ARM || ARM64 || COMPILE_TEST
        depends on ARCH_RENESAS || COMPILE_TEST
        select DRM_KMS_HELPER
+       select DRM_DISPLAY_HELPER
+       select DRM_BRIDGE_CONNECTOR
        select DRM_GEM_DMA_HELPER
        select VIDEOMODE_HELPERS
        help

diff --git a/drivers/gpu/drm/renesas/rz-du/Kconfig b/drivers/gpu/drm/renesas/rz-du/Kconfig
index 5f0db2c5fee6c73cb3119ddd532da2701b3c1ce3..e1a6dd322cafb26a30b9b8d916fccdd9614778ff 100644 (file)
--- a/drivers/gpu/drm/renesas/rz-du/Kconfig
+++ b/drivers/gpu/drm/renesas/rz-du/Kconfig
@@ -6,6 +6,8 @@ config DRM_RZG2L_DU
        depends on VIDEO_RENESAS_VSP1
        select DRM_GEM_DMA_HELPER
        select DRM_KMS_HELPER
+       select DRM_DISPLAY_HELPER
+       select DRM_BRIDGE_CONNECTOR
        select VIDEOMODE_HELPERS
        help
          Choose this option if you have an RZ/G2L alike chipset.

diff --git a/drivers/gpu/drm/renesas/shmobile/Kconfig b/drivers/gpu/drm/renesas/shmobile/Kconfig
index 027220b8fe1c5fbd462a2763156d192b4e855feb..c329ab8a7a8b7bbf2770e405495d3603edcb9c7d 100644 (file)
--- a/drivers/gpu/drm/renesas/shmobile/Kconfig
+++ b/drivers/gpu/drm/renesas/shmobile/Kconfig
@@ -5,6 +5,8 @@ config DRM_SHMOBILE
        depends on ARCH_RENESAS || ARCH_SHMOBILE || COMPILE_TEST
        select BACKLIGHT_CLASS_DEVICE
        select DRM_KMS_HELPER
+       select DRM_DISPLAY_HELPER
+       select DRM_BRIDGE_CONNECTOR
        select DRM_GEM_DMA_HELPER
        select VIDEOMODE_HELPERS
        help

diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig
index 7df875e38517c70a6d3d62c89b2f93af91fb9645..23c49e91f1ccfcee6ed302feefdaf0cc0d20b688 100644 (file)
--- a/drivers/gpu/drm/rockchip/Kconfig
+++ b/drivers/gpu/drm/rockchip/Kconfig
@@ -86,6 +86,8 @@ config ROCKCHIP_LVDS
        bool "Rockchip LVDS support"
        depends on DRM_ROCKCHIP
        depends on PINCTRL && OF
+       select DRM_DISPLAY_HELPER
+       select DRM_BRIDGE_CONNECTOR
        help
          Choose this option to enable support for Rockchip LVDS controllers.
          Rockchip rk3288 SoC has LVDS TX Controller can be used, and it
@@ -96,6 +98,8 @@ config ROCKCHIP_RGB
        bool "Rockchip RGB support"
        depends on DRM_ROCKCHIP
        depends on PINCTRL
+       select DRM_DISPLAY_HELPER
+       select DRM_BRIDGE_CONNECTOR
        help
          Choose this option to enable support for Rockchip RGB output.
          Some Rockchip CRTCs, like rv1108, can directly output parallel

diff --git a/drivers/gpu/drm/tegra/Kconfig b/drivers/gpu/drm/tegra/Kconfig
index 782f51d3044af1fc84af3ea581be438f55764782..e688d810465254123f3324db25faefd7e362d6da 100644 (file)
--- a/drivers/gpu/drm/tegra/Kconfig
+++ b/drivers/gpu/drm/tegra/Kconfig
@@ -8,6 +8,7 @@ config DRM_TEGRA
        select DRM_DISPLAY_DP_HELPER
        select DRM_DISPLAY_HDMI_HELPER
        select DRM_DISPLAY_HELPER
+       select DRM_BRIDGE_CONNECTOR
        select DRM_DISPLAY_DP_AUX_BUS
        select DRM_KMS_HELPER
        select DRM_MIPI_DSI

diff --git a/drivers/gpu/drm/tidss/Kconfig b/drivers/gpu/drm/tidss/Kconfig
index 37860080616760cf19be513840e2cfa66cd282b1..2385c56493b9a6548e4b85085691a41ec0aeaf0d 100644 (file)
--- a/drivers/gpu/drm/tidss/Kconfig
+++ b/drivers/gpu/drm/tidss/Kconfig
@@ -3,6 +3,8 @@ config DRM_TIDSS
        depends on DRM && OF
        depends on ARM || ARM64 || COMPILE_TEST
        select DRM_KMS_HELPER
+       select DRM_DISPLAY_HELPER
+       select DRM_BRIDGE_CONNECTOR
        select DRM_GEM_DMA_HELPER
        help
          The TI Keystone family SoCs introduced a new generation of

diff --git a/drivers/gpu/drm/xlnx/Kconfig b/drivers/gpu/drm/xlnx/Kconfig
index 68ee897de9d758848fe1632d44a3fba566f97a13..626e5ac4c33d9e0fc3e7a7fb6cdf28e74ed58f65 100644 (file)
--- a/drivers/gpu/drm/xlnx/Kconfig
+++ b/drivers/gpu/drm/xlnx/Kconfig
@@ -8,6 +8,7 @@ config DRM_ZYNQMP_DPSUB
        select DMA_ENGINE
        select DRM_DISPLAY_DP_HELPER
        select DRM_DISPLAY_HELPER
+       select DRM_BRIDGE_CONNECTOR
        select DRM_GEM_DMA_HELPER
        select DRM_KMS_HELPER
        select GENERIC_PHY