xf86-video-intel: src/sna/blt.c

[Chris Wilson]

 src/sna/blt.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9b9643171359194478ab9f7126012b659d2ae7a1
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Fri Apr 24 09:43:37 2015 +0200

    sna: Fix build with gcc 5.0
    
    gcc generates an error at build time because it fails to inline some
    functions:
    
      blt.c: In function 'affine_blt':
      blt.c:980:1: error: inlining failed in call to always_inline
      'bilinear_weight': optimization level attribute mismatch
       bilinear_weight(pixman_fixed_t x)
    
      blt.c:1164:7: error: called from here
          fy = bilinear_weight(y1);
             ^
      blt.c:980:1: error: inlining failed in call to always_inline
      'bilinear_weight': optimization level attribute mismatch
       bilinear_weight(pixman_fixed_t x)
    
      blt.c:1163:7: error: called from here
          fx = bilinear_weight(x1);
             ^
      blt.c:989:1: error: inlining failed in call to always_inline
      'bilinear_interpolation': optimization level attribute mismatch
       bilinear_interpolation(uint32_t tl, uint32_t tr,
       ^
      blt.c:1207:11: error: called from here
          b[i] = bilinear_interpolation(tl, tr, bl, br, fx, fy);
               ^
    
    Do not force inlining of these functions and let the compiler decide to
    avoid the compilation failure.
    
    v2: fix up the other two force_inlines whilst we are here
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>

diff --git a/src/sna/blt.c b/src/sna/blt.c
index a2472c1..2dae9c2 100644
--- a/src/sna/blt.c
+++ b/src/sna/blt.c
@@ -976,7 +976,7 @@ memcpy_xor(const void *src, void *dst, int bpp,
 }
 
 #define BILINEAR_INTERPOLATION_BITS 4
-static force_inline int
+static inline int
 bilinear_weight(pixman_fixed_t x)
 {
 	return (x >> (16 - BILINEAR_INTERPOLATION_BITS)) &
@@ -985,7 +985,7 @@ bilinear_weight(pixman_fixed_t x)
 
 #if BILINEAR_INTERPOLATION_BITS <= 4
 /* Inspired by Filter_32_opaque from Skia */
-static force_inline uint32_t
+static inline uint32_t
 bilinear_interpolation(uint32_t tl, uint32_t tr,
 		       uint32_t bl, uint32_t br,
 		       int distx, int disty)
@@ -1018,7 +1018,7 @@ bilinear_interpolation(uint32_t tl, uint32_t tr,
 	return ((lo >> 8) & 0xff00ff) | (hi & ~0xff00ff);
 }
 #elif SIZEOF_LONG > 4
-static force_inline uint32_t
+static inline uint32_t
 bilinear_interpolation(uint32_t tl, uint32_t tr,
 		       uint32_t bl, uint32_t br,
 		       int distx, int disty)
@@ -1063,7 +1063,7 @@ bilinear_interpolation(uint32_t tl, uint32_t tr,
 	return (uint32_t)(r >> 16);
 }
 #else
-static force_inline uint32_t
+static inline uint32_t
 bilinear_interpolation(uint32_t tl, uint32_t tr,
 		       uint32_t bl, uint32_t br,
 		       int distx, int disty)