fbdev: c2p: Fix link failure on non-inlining
PATCH v2 1/1 fbdev: c2p: Fix link failure on non-inlining
When the compiler decides not to inline the Chunky-to-Planar core functions, the build fails with:
c2p_planar.c:(.text+0xd6): undefined reference to `c2p_unsupported'
c2p_planar.c:(.text+0x1dc): undefined reference to `c2p_unsupported'
c2p_iplan2.c:(.text+0xc4): undefined reference to `c2p_unsupported'
c2p_iplan2.c:(.text+0x150): undefined reference to `c2p_unsupported'Fix this by marking the functions __always_inline.
While this could be triggered before by manually enabling both CONFIG_OPTIMIZE_INLINING and CONFIG_CC_OPTIMIZE_FOR_SIZE, it was exposed in the m68k defconfig by commit ac7c3e4ff401b304 ("compiler: enable CONFIG_OPTIMIZE_INLINING forcibly").
---
This is a fix for v5.4-rc1.
v2:
- Add Reviewed-by,
- Fix Fixes,
- Add more explanation.
--- drivers/video/fbdev/c2p_core.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/video/fbdev/c2p_core.h +4 -4
@@ -29,7 +29,7 @@ static inline void _transp(u32 d[], unsigned int i1, unsigned int i2,extern void c2p_unsupported (void ); -static inline u32 get_mask (unsigned int n) +static __always_inline u32 get_mask(unsigned int n) {switch (n) {case 1 :
@@ -57,7 +57,7 @@ static inline u32 get_mask(unsigned int n)* Transpose operations on 8 32-bit words */ -static inline void transp8 (u32 d[],unsigned int n,unsigned int m) +static __always_inline void transp8(u32 d[], unsigned int n, unsigned int m) {u32 mask =get_mask (n);
@@ -99,7 +99,7 @@ static inline void transp8(u32 d[], unsigned int n, unsigned int m)* Transpose operations on 4 32-bit words */ -static inline void transp4 (u32 d[],unsigned int n,unsigned int m) +static __always_inline void transp4(u32 d[], unsigned int n, unsigned int m) {u32 mask =get_mask (n);
@@ -126,7 +126,7 @@ static inline void transp4(u32 d[], unsigned int n, unsigned int m)* Transpose operations on 4 32-bit words (reverse order) */ -static inline void transp4x (u32 d[],unsigned int n,unsigned int m) +static __always_inline void transp4x(u32 d[], unsigned int n, unsigned int m) {u32 mask =get_mask (n);
Signature · 1 line
2.17.1
Hi Bartlomiej, Andrew,
Quoted 15 lines · Geert Uytterhoeven
When the compiler decides not to inline the Chunky-to-Planar core functions, the build fails with:
c2p_planar.c:(.text+0xd6): undefined reference to `c2p_unsupported' c2p_planar.c:(.text+0x1dc): undefined reference to `c2p_unsupported' c2p_iplan2.c:(.text+0xc4): undefined reference to `c2p_unsupported' c2p_iplan2.c:(.text+0x150): undefined reference to `c2p_unsupported'Fix this by marking the functions
__always_inline.While this could be triggered before by manually enabling both
CONFIG_OPTIMIZE_INLININGandCONFIG_CC_OPTIMIZE_FOR_SIZE, it was exposed in the m68k defconfig by commitac7c3e4ff401b304("compiler: enableCONFIG_OPTIMIZE_INLININGforcibly").
Quoted 6 lines
Fixes 9012d011660ea5cf ("compiler: allow all arches to enable CONFIG_OPTIMIZE_INLINING")Reported-by [email protected]Signed-off-by Geert Uytterhoeven <[email protected]>Reviewed-by Masahiro Yamada <[email protected]>---
This is a fix for v5.4-rc1.
Can you please apply this for v5.4?
This is one of the 4 remaining build regressions, compared to v5.3.
Thanks!
Quoted 4 lines
v2:
- Add Reviewed-by,
- Fix Fixes,
- Add more explanation.
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Daniel Vetter
AppliedQuoted 26 lines · Geert Uytterhoeven
Hi Bartlomiej, Andrew,
Quoted 15 lines · Geert Uytterhoeven
When the compiler decides not to inline the Chunky-to-Planar core functions, the build fails with:
c2p_planar.c:(.text+0xd6): undefined reference to `c2p_unsupported' c2p_planar.c:(.text+0x1dc): undefined reference to `c2p_unsupported' c2p_iplan2.c:(.text+0xc4): undefined reference to `c2p_unsupported' c2p_iplan2.c:(.text+0x150): undefined reference to `c2p_unsupported'Fix this by marking the functions
__always_inline.While this could be triggered before by manually enabling both
CONFIG_OPTIMIZE_INLININGandCONFIG_CC_OPTIMIZE_FOR_SIZE, it was exposed in the m68k defconfig by commitac7c3e4ff401b304("compiler: enableCONFIG_OPTIMIZE_INLININGforcibly").Quoted 6 lines
Fixes 9012d011660ea5cf ("compiler: allow all arches to enable CONFIG_OPTIMIZE_INLINING")Reported-by [email protected]Signed-off-by Geert Uytterhoeven <[email protected]>Reviewed-by Masahiro Yamada <[email protected]>---
This is a fix for v5.4-rc1.
Quoted 2 lines
Can you please apply this for v5.4?
This is one of the 4 remaining build regressions, compared to v5.3.
Applied to drm-misc-fixes, thanks for your patch.
-Daniel
Quoted 22 lines
Thanks!
Quoted 4 lines
v2:
- Add Reviewed-by,
- Fix Fixes,
- Add more explanation.Gr{oetje,eeting}s,
Geert
Signature · 9 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch