pixman: Branch 'master' - 2 commits

[Siarhei Siamashka]

 pixman/pixman-fast-path.c |    2 +-
 pixman/pixman-mips.c      |   16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

New commits:
commit 6e56098c0338ce74228187e4c96fed1a66cb0956
Author: Siarhei Siamashka <siarhei.siamashka at gmail.com>
Date:   Sat Sep 29 02:29:22 2012 +0300

    Add missing force_inline to in() function used for C fast paths

diff --git a/pixman/pixman-fast-path.c b/pixman/pixman-fast-path.c
index 22bfd30..a12c6cf 100644
--- a/pixman/pixman-fast-path.c
+++ b/pixman/pixman-fast-path.c
@@ -90,7 +90,7 @@ over (uint32_t src,
     return dest;
 }
 
-static uint32_t
+static force_inline uint32_t
 in (uint32_t x,
     uint8_t  y)
 {
commit 90bcafa495c1074b0ea1d35f99aa4837917494bd
Author: Siarhei Siamashka <siarhei.siamashka at gmail.com>
Date:   Sun Jul 8 23:10:00 2012 +0300

    MIPS: skip runtime detection for DSPr2 if -mdspr2 option is in CFLAGS
    
    This provides a way to enable MIPS DSP ASE optimizations if running
    under qemu-user (where /proc/cpuinfo contains information about the
    host processor instead of the emulated one). Can be used for running
    pixman test suite in qemu-user when having no access to real MIPS
    hardware.

diff --git a/pixman/pixman-mips.c b/pixman/pixman-mips.c
index 2b280c6..3048813 100644
--- a/pixman/pixman-mips.c
+++ b/pixman/pixman-mips.c
@@ -75,9 +75,19 @@ _pixman_mips_get_implementations (pixman_implementation_t *imp)
 #endif
 
 #ifdef USE_MIPS_DSPR2
-    /* Only currently available MIPS core that supports DSPr2 is 74K. */
-    if (!_pixman_disabled ("mips-dspr2") && have_feature ("MIPS 74K"))
-	imp = _pixman_implementation_create_mips_dspr2 (imp);
+    if (!_pixman_disabled ("mips-dspr2"))
+    {
+	int already_compiling_everything_for_dspr2 = 0;
+#if defined(__mips_dsp) && (__mips_dsp_rev >= 2)
+	already_compiling_everything_for_dspr2 = 1;
+#endif
+	if (already_compiling_everything_for_dspr2 ||
+	    /* Only currently available MIPS core that supports DSPr2 is 74K. */
+	    have_feature ("MIPS 74K"))
+	{
+	    imp = _pixman_implementation_create_mips_dspr2 (imp);
+	}
+    }
 #endif
 
     return imp;