Commit b330f397 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Daniel Vetter

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 ac7c3e4f ("compiler: enable
CONFIG_OPTIMIZE_INLINING forcibly").

Fixes: 9012d011 ("compiler: allow all arches to enable CONFIG_OPTIMIZE_INLINING")
Reported-by: noreply@ellerman.id.au
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190927094708.11563-1-geert@linux-m68k.org
parent f70744c6
...@@ -29,7 +29,7 @@ static inline void _transp(u32 d[], unsigned int i1, unsigned int i2, ...@@ -29,7 +29,7 @@ static inline void _transp(u32 d[], unsigned int i1, unsigned int i2,
extern void c2p_unsupported(void); extern void c2p_unsupported(void);
static inline u32 get_mask(unsigned int n) static __always_inline u32 get_mask(unsigned int n)
{ {
switch (n) { switch (n) {
case 1: case 1:
...@@ -57,7 +57,7 @@ static inline u32 get_mask(unsigned int n) ...@@ -57,7 +57,7 @@ static inline u32 get_mask(unsigned int n)
* Transpose operations on 8 32-bit words * 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); u32 mask = get_mask(n);
...@@ -99,7 +99,7 @@ static inline void transp8(u32 d[], unsigned int n, unsigned int m) ...@@ -99,7 +99,7 @@ static inline void transp8(u32 d[], unsigned int n, unsigned int m)
* Transpose operations on 4 32-bit words * 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); u32 mask = get_mask(n);
...@@ -126,7 +126,7 @@ static inline void transp4(u32 d[], unsigned int n, unsigned int m) ...@@ -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) * 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); u32 mask = get_mask(n);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment