forked from mirrors/linux
		
	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>
This commit is contained in:
		
							parent
							
								
									466cb3c630
								
							
						
					
					
						commit
						9da7ec9b19
					
				
					 21 changed files with 38 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -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
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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 \
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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 \
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue