commit 989c08a2554ac90861e036f9efd0fbedd5f5aff5
author Saurabh Shah <saurshah@codeaurora.org> Wed May 03 12:07:12 2017 -0700
committer Saurabh Shah <saurshah@codeaurora.org> Wed May 03 14:03:46 2017 -0700
tree 2a0a42f31f704ae0ade3dfd2fbc75be51a11d7e8
parent 394b35ad958070032f9c6cfccc02f9694197c972
parent 8e3fc3e43e8844d556ea65fce5f385bf62d7ba59

Merge remote-tracking branch 'quic/display.lnx.3.0-dev' into display.lnx.4.0-dev

Change-Id: I540056d9295635cb4d2ffcaf2512ee6dbe0ddc0a

libmemtrack/kgsl.c

diff --git a/libmemtrack/kgsl.c b/libmemtrack/kgsl.c
index 3f36b8d..69ee901 100644
--- a/libmemtrack/kgsl.c
+++ b/libmemtrack/kgsl.c
@@ -93,31 +93,41 @@
             continue;
         }
 
-        if (size == 0)
+        if (size == 0) {
+            fclose(fp);
             return -EINVAL;
+        }
 
-        if (unaccounted_size + size < size)
+        if (unaccounted_size + size < size) {
+            fclose(fp);
             return -ERANGE;
+        }
 
         if (type == MEMTRACK_TYPE_GL && strcmp(line_type, "gpumem") == 0) {
 
             if (flags[6] == 'Y') {
-                if (accounted_size + mapsize < accounted_size)
+                if (accounted_size + mapsize < accounted_size) {
+                    fclose(fp);
                     return -ERANGE;
+                }
 
                 accounted_size += mapsize;
 
-                if (mapsize > size)
+                if (mapsize > size) {
+                    fclose(fp);
                     return -EINVAL;
-
+                }
                 unaccounted_size += size - mapsize;
-            } else
+            } else {
                 unaccounted_size += size;
+            }
         } else if (type == MEMTRACK_TYPE_GRAPHICS && strcmp(line_type, "ion") == 0) {
-            if (strcmp(line_usage, "egl_surface") == 0)
+            if (strcmp(line_usage, "egl_surface") == 0) {
                 unaccounted_size += size;
-            else if (egl_surface_count == 0)
+            }
+            else if (egl_surface_count == 0) {
                 unaccounted_size += size / (egl_image_count ? egl_image_count : 1);
+            }
         }
     }
 

sdm/libs/core/drm/hw_info_drm.cpp

diff --git a/sdm/libs/core/drm/hw_info_drm.cpp b/sdm/libs/core/drm/hw_info_drm.cpp
index f7ce652..a2ba960 100644
--- a/sdm/libs/core/drm/hw_info_drm.cpp
+++ b/sdm/libs/core/drm/hw_info_drm.cpp
@@ -288,6 +288,7 @@
           hw_resource->max_cursor_size = pipe_obj.second.max_linewidth;
         }
         hw_resource->num_cursor_pipe++;
+        break;
       default:
         continue;  // Not adding any other pipe type
     }

sdm/libs/utils/Makefile.am

diff --git a/sdm/libs/utils/Makefile.am b/sdm/libs/utils/Makefile.am
index ba6efae..d8d8dc5 100644
--- a/sdm/libs/utils/Makefile.am
+++ b/sdm/libs/utils/Makefile.am
@@ -1,11 +1,12 @@
 cpp_sources = debug.cpp \
               rect.cpp \
               sys.cpp \
-              formats.cpp
+              formats.cpp \
+              utils.cpp
 
 lib_LTLIBRARIES = libsdmutils.la
 libsdmutils_la_CC = @CC@
 libsdmutils_la_SOURCES = $(cpp_sources)
 libsdmutils_la_CFLAGS = $(COMMON_CFLAGS) -DLOG_TAG=\"SDM\"
 libsdmutils_la_CPPFLAGS = $(AM_CPPFLAGS)
-libsdmutils_la_LDFLAGS = -shared -avoid-version
\ No newline at end of file
+libsdmutils_la_LDFLAGS = -shared -avoid-version