diff --git a/src/modules/evas/engines/gl_common/evas_gl_common.h b/src/modules/evas/engines/gl_common/evas_gl_common.h
index f059dd5a72..0caa3ad068 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_common.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_common.h
@@ -230,11 +230,11 @@ struct _Evas_GL_Shared
 #define MAX_CUTOUT             512
 #define DEF_CUTOUT                  512
 
-// FIXME bug with pipes > 1 right now, should default to 32
 #define MAX_PIPES              128
 #define DEF_PIPES                    32
-#define DEF_PIPES_SGX_540            32
-#define DEF_PIPES_TEGRA_2             1
+#define DEF_PIPES_SGX_540            24
+#define DEF_PIPES_TEGRA_2             8
+#define DEF_PIPES_TEGRA_3            24
 
 #define MIN_ATLAS_ALLOC         16
 #define MAX_ATLAS_ALLOC       1024
diff --git a/src/modules/evas/engines/gl_common/evas_gl_context.c b/src/modules/evas/engines/gl_common/evas_gl_context.c
index 945c578fdd..6668dcd504 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -657,6 +657,8 @@ evas_gl_common_context_new(void)
           {
              if      (strstr(s, "PowerVR SGX 540"))
                 shared->info.tune.pipes.max = DEF_PIPES_SGX_540;
+             else if (strstr(s, "NVIDIA Tegra 3"))
+                shared->info.tune.pipes.max = DEF_PIPES_TEGRA_3;
              else if (strstr(s, "NVIDIA Tegra"))
                 shared->info.tune.pipes.max = DEF_PIPES_TEGRA_2;
           }