Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 58d4d298 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Maxime Ripard
Browse files

drm/sun4i: fix build failure with CONFIG_DRM_SUN8I_MIXER=m 



Having DRM_SUN4I built-in but DRM_SUN8I_MIXER as a loadable module results in
a link error, as we try to access a symbol from the sun8i_tcon_top.ko module:

ERROR: "sun8i_tcon_top_of_table" [drivers/gpu/drm/sun4i/sun8i-drm-hdmi.ko] undefined!
ERROR: "sun8i_tcon_top_of_table" [drivers/gpu/drm/sun4i/sun4i-drm.ko] undefined!

This solves the problem by adding a silent symbol for the tcon_top module,
building it as a separate module in exactly the cases that we need it,
but in a way that it is reachable by the other modules.

Fixes: 57e23de0 ("drm/sun4i: DW HDMI: Expand algorithm for possible crtcs")
Fixes: ef0cf644 ("drm/sun4i: Add support for traversing graph with TCON TOP")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180711144403.1022829-1-arnd@arndb.de
parent 7da9b2e4

drivers/gpu/drm/sun4i/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -68,4 +68,11 @@ config DRM_SUN8I_MIXER 
	  graphics mixture and feed graphics to TCON, If M is

	  selected the module will be called sun8i-mixer.



config DRM_SUN8I_TCON_TOP

	tristate

	default DRM_SUN4I if DRM_SUN8I_MIXER!=n

	help

	  TCON TOP is responsible for configuring display pipeline for

	  HTMI, TVE and LCD.



endif

drivers/gpu/drm/sun4i/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -36,4 +36,5 @@ obj-$(CONFIG_DRM_SUN4I_BACKEND) += sun4i-backend.o sun4i-frontend.o 
obj-$(CONFIG_DRM_SUN4I_HDMI)	+= sun4i-drm-hdmi.o

obj-$(CONFIG_DRM_SUN6I_DSI)	+= sun6i-dsi.o

obj-$(CONFIG_DRM_SUN8I_DW_HDMI)	+= sun8i-drm-hdmi.o

obj-$(CONFIG_DRM_SUN8I_MIXER)	+= sun8i-mixer.o sun8i_tcon_top.o
 
obj-$(CONFIG_DRM_SUN8I_MIXER)	+= sun8i-mixer.o

obj-$(CONFIG_DRM_SUN8I_TCON_TOP) += sun8i_tcon_top.o

drivers/gpu/drm/sun4i/sun4i_drv.c

+2 −1
Original line number Diff line number Diff line
@@ -216,7 +216,8 @@ static bool sun4i_drv_node_is_tcon_with_ch0(struct device_node *node) 


static bool sun4i_drv_node_is_tcon_top(struct device_node *node)

{

	return !!of_match_node(sun8i_tcon_top_of_table, node);

	return IS_ENABLED(CONFIG_DRM_SUN8I_TCON_TOP) &&

		!!of_match_node(sun8i_tcon_top_of_table, node);

}



static int compare_of(struct device *dev, void *data)

drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c

+2 −1
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ sun8i_dw_hdmi_mode_valid(struct drm_connector *connector, 


static bool sun8i_dw_hdmi_node_is_tcon_top(struct device_node *node)

{

	return !!of_match_node(sun8i_tcon_top_of_table, node);

	return IS_ENABLED(CONFIG_DRM_SUN8I_TCON_TOP) &&

		!!of_match_node(sun8i_tcon_top_of_table, node);

}



static u32 sun8i_dw_hdmi_find_possible_crtcs(struct drm_device *drm,