one valgrind.supp to rule them all.

tools/valgrind.supp

Index: tools/valgrind.supp
diff --git a/tools/valgrind.supp b/tools/valgrind.supp
index 9cf392d0fced9ab5cbc035cabf5dee94ccd7d623..30cac399b34e4982e06c6c65d15514313c82994b 100644
--- a/tools/valgrind.supp
+++ b/tools/valgrind.supp
@@ -1,45 +1,8 @@
-# Pass this file to Valgrind with "--suppressions=tests/valgrind.supp"
+# Pass this file to Valgrind with "--suppressions=tools/valgrind.supp"
 
+# Third party lib, driver issues.
 {
-    FcConfig
-    Memcheck:Addr4
-    fun:FcConfigFileExists
-}
-{
-    FcFontSetCreate_Leak
-    Memcheck:Leak
-    fun:malloc
-    fun:FcFontSetCreate
-}
-{
-    FcFontSetAdd_Leak
-    Memcheck:Leak
-    fun:realloc
-    fun:FcFontSetAdd
-}
-{
-    lib_png_inflate
-    Memcheck:Cond
-    fun:inflateReset2
-    fun:inflateInit2_
-    fun:png_create_read_struct_2
-    fun:png_create_read_struct
-}
-{
-    RTConfRegistry_leak
-    Memcheck:Leak
-    fun:_Znwm
-    fun:_ZN16SkRTConfRegistry12registerConfEP12SkRTConfBase
-}
-{
-    XML_ParseBuffer_leak
-    Memcheck:Leak
-    fun:malloc
-    fun:FcPatternObjectInsertElt
-    fun:FcPatternObjectAddWithBinding
-}
-{
-    driver_bug_1
+    ati_driver_bug_1
     Memcheck:Param
     ioctl(generic)
     fun:ioctl
@@ -47,36 +10,36 @@
     obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
 }
 {
-    driver_bug_2
+    ati_driver_bug_2
     Memcheck:Cond
     obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
 }
 {
-    driver_bug_3
+    ati_driver_bug_3
     Memcheck:Addr8
     ...
     obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
 }
 {
-    driver_bug_4
+    ati_driver_bug_4
     Memcheck:Addr4
     ...
     obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
 }
 {
-    driver_bug_5
+    ati_driver_bug_5
     Memcheck:Addr2
     ...
     obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
 }
 {
-    driver_bug_6
+    ati_driver_bug_6
     Memcheck:Addr1
     ...
     obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
 }
 {
-    driver_bug_7
+    ati_driver_bug_7
     Memcheck:Leak
     fun:malloc
     obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
@@ -88,19 +51,77 @@
     obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
 }
 {
-    driver_bug_9
+    ati_driver_bug_9
     Memcheck:Leak
     fun:calloc
     obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
 }
 {
-    driver_bug_10
+    ati_driver_bug_10
     Memcheck:Leak
     fun:malloc
     obj:/usr/lib/fglrx/fglrx-libGL.so.1.2
 }
-# the gpu_issue_* suppressions suppress issues that cannot be reproduced
-# locally. 
+{
+    nv_driver_bug_1
+    Memcheck:Param
+    write(buf)
+    obj:/usr/lib/libnvidia-glcore.so*
+}
+{
+    nv_driver_bug_2
+    Memcheck:Cond
+    obj:/usr/lib/libnvidia-glcore.so*
+}
+{
+    nv_driver_bug_3
+    Memcheck:Leak
+    fun:calloc
+    obj:/usr/lib/libGL.so*
+}
+{
+    font_config_bug_1
+    Memcheck:Addr4
+    fun:FcConfigFileExists
+}
+{
+    font_config_bug_2
+    Memcheck:Leak
+    fun:malloc
+    fun:FcFontSetCreate
+}
+{
+    font_config_bug_3
+    Memcheck:Leak
+    fun:realloc
+    fun:FcFontSetAdd
+}
+{
+    font_config_bug_4
+    Memcheck:Leak
+    fun:malloc
+    fun:FcPatternObjectInsertElt
+    fun:FcPatternObjectAddWithBinding
+}
+{
+    zlib_bug_1
+    Memcheck:Cond
+    fun:inflateReset2
+    fun:inflateInit2_
+    fun:png_create_read_struct_2
+    fun:png_create_read_struct
+}
+
+# Why is it OK to suppress this?
+{
+    SkRTConfRegistry_bug_1
+    Memcheck:Leak
+    fun:_Znwm
+    fun:_ZN16SkRTConfRegistry12registerConfEP12SkRTConfBase
+}
+
+# The gpu_issue_* suppressions suppress issues that cannot be reproduced locally. These appear to be
+# due to valgrind not knowing about memory mapped by the ATI driver via glMapBuffer.
 {
     gpu_issue_1
     Memcheck:Addr2