Unverified Commit 185e0beb authored Sep 11, 2018 by Maxime Ripard

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_de_config" [drivers/gpu/drm/sun4i/sun4i-tcon.ko] undefined!
ERROR: "sun8i_tcon_top_set_hdmi_src" [drivers/gpu/drm/sun4i/sun4i-tcon.ko] undefined!
ERROR: "sun8i_tcon_top_of_table" [drivers/gpu/drm/sun4i/sun4i-tcon.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: cf77d79b ("drm/sun4i: tcon: Add another way for matching mixers with tcon")
Fixes: 0305189a ("drm/sun4i: tcon: Add support for R40 TCON")
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Tested-by: Jon Hunter <jonathanh@nvidia.com>
Tested-by: Matt Hart <matthew.hart@linaro.org>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180911113325.11024-1-maxime.ripard@bootlin.com

parent bf8744e4

drivers/gpu/drm/sun4i/sun4i_tcon.c

+11 −3

Original line number	Diff line number	Diff line
		@@ -974,7 +974,8 @@ static bool sun4i_tcon_connected_to_tcon_top(struct device_node *node)

		remote = of_graph_get_remote_node(node, 0, -1);
		if (remote) {
		ret = !!of_match_node(sun8i_tcon_top_of_table, remote);
		ret = !!(IS_ENABLED(CONFIG_DRM_SUN8I_TCON_TOP) &&
		of_match_node(sun8i_tcon_top_of_table, remote));
		of_node_put(remote);
		}

		@@ -1402,13 +1403,20 @@ static int sun8i_r40_tcon_tv_set_mux(struct sun4i_tcon *tcon,
		if (!pdev)
		return -EINVAL;

		if (encoder->encoder_type == DRM_MODE_ENCODER_TMDS) {
		if (IS_ENABLED(CONFIG_DRM_SUN8I_TCON_TOP) &&
		encoder->encoder_type == DRM_MODE_ENCODER_TMDS) {
		ret = sun8i_tcon_top_set_hdmi_src(&pdev->dev, id);
		if (ret)
		return ret;
		}

		return sun8i_tcon_top_de_config(&pdev->dev, tcon->id, id);
		if (IS_ENABLED(CONFIG_DRM_SUN8I_TCON_TOP)) {
		ret = sun8i_tcon_top_de_config(&pdev->dev, tcon->id, id);
		if (ret)
		return ret;
		}

		return 0;
		}

		static const struct sun4i_tcon_quirks sun4i_a10_quirks = {