Skip to contentSkip to conversation

drm: of: fix link error

PATCH In review Arnd Bergmann 2 participants 2 messages Jan 7, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm: of: fix link error

The new dummy helper is non-static, so every driver gets its own copy, leading to a link failure:

drivers/gpu/drm/imx/imx-ldb.o: In function `drm_of_lvds_get_dual_link_pixel_order':
imx-ldb.c:(.text+0x140): multiple definition of drm_of_lvds_get_dual_link_pixel_order' drivers/gpu/drm/imx/imx-drm-core.o:imx-drm-core.c:(.text+0x330): first defined here drivers/gpu/drm/imx/dw_hdmi-imx.o: In function drm_of_lvds_get_dual_link_pixel_order':
dw_hdmi-imx.c:(.text+0xd0): multiple definition of drm_of_lvds_get_dual_link_pixel_order' drivers/gpu/drm/imx/imx-drm-core.o:imx-drm-core.c:(.text+0x330): first defined here drivers/gpu/drm/bridge/synopsys/dw-hdmi.o: In function drm_of_lvds_get_dual_link_pixel_order':
dw-hdmi.c:(.text+0x3b90): multiple definition of drm_of_lvds_get_dual_link_pixel_order' drivers/gpu/drm/imx/imx-drm-core.o:imx-drm-core.c:(.text+0x330): first defined here drivers/gpu/drm/etnaviv/etnaviv_drv.o: In function drm_of_lvds_get_dual_link_pixel_order':
etnaviv_drv.c:(.text+0x9d0): multiple definition of `drm_of_lvds_get_dual_link_pixel_order' drivers/gpu/drm/imx/imx-drm-core.o:imx-drm-core.c:(.text+0x330): first defined here

Add the missing 'static' keyword.

Fixes 6529007522de ("drm: of: Add drm_of_lvds_get_dual_link_pixel_order")
---
 include/drm/drm_of.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/drm/drm_of.h +1 -1
index 8ec7ca6d2369..3398be966021 100644
@@ -92,7 +92,7 @@ static inline int drm_of_find_panel_or_bridge(const struct device_node *np,
 	return -EINVAL;
 }
 
-int drm_of_lvds_get_dual_link_pixel_order(const struct device_node *port1,
+static inline int drm_of_lvds_get_dual_link_pixel_order(const struct device_node *port1,
 					  const struct device_node *port2)
 {
 	return -EINVAL;
Signature · 6 lines
2.20.0

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#1 lore raw

Hi Arnd,

Thank you for the patch.

Quoted 16 lines · Arnd Bergmann

The new dummy helper is non-static, so every driver gets its own copy, leading to a link failure:

drivers/gpu/drm/imx/imx-ldb.o: In function `drm_of_lvds_get_dual_link_pixel_order':
imx-ldb.c:(.text+0x140): multiple definition of drm_of_lvds_get_dual_link_pixel_order' drivers/gpu/drm/imx/imx-drm-core.o:imx-drm-core.c:(.text+0x330): first defined here drivers/gpu/drm/imx/dw_hdmi-imx.o: In function drm_of_lvds_get_dual_link_pixel_order':
dw_hdmi-imx.c:(.text+0xd0): multiple definition of drm_of_lvds_get_dual_link_pixel_order' drivers/gpu/drm/imx/imx-drm-core.o:imx-drm-core.c:(.text+0x330): first defined here drivers/gpu/drm/bridge/synopsys/dw-hdmi.o: In function drm_of_lvds_get_dual_link_pixel_order':
dw-hdmi.c:(.text+0x3b90): multiple definition of drm_of_lvds_get_dual_link_pixel_order' drivers/gpu/drm/imx/imx-drm-core.o:imx-drm-core.c:(.text+0x330): first defined here drivers/gpu/drm/etnaviv/etnaviv_drv.o: In function drm_of_lvds_get_dual_link_pixel_order':
etnaviv_drv.c:(.text+0x9d0): multiple definition of `drm_of_lvds_get_dual_link_pixel_order' drivers/gpu/drm/imx/imx-drm-core.o:imx-drm-core.c:(.text+0x330): first defined here

Quoted 4 lines

Add the missing 'static' keyword.

Fixes 6529007522de ("drm: of: Add drm_of_lvds_get_dual_link_pixel_order")

I've sent "[PATCH] drm: of: Fix linking when CONFIG_OF is not set" to fix this issue, back on December the 19th. Daniel, Dave, could you pick this up ? It couldn't be merged through drm-misc last time we checked as the offending patch wasn't there.

Quoted 17 lines
---
 include/drm/drm_of.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/drm/drm_of.h +1 -1
index 8ec7ca6d2369..3398be966021 100644
@@ -92,7 +92,7 @@ static inline int drm_of_find_panel_or_bridge(const struct device_node *np,
 	return -EINVAL;
 }
 
-int drm_of_lvds_get_dual_link_pixel_order(const struct device_node *port1,
+static inline int drm_of_lvds_get_dual_link_pixel_order(const struct device_node *port1,
 					  const struct device_node *port2)
 {
 	return -EINVAL;
Signature · 3 lines
Regards,

Laurent Pinchart