commit 5a2b1bdeab159ee2f4dc07f0df89d07e7cfbeb2f
author Linux Build Service Account <lnxbuild@quicinc.com> Wed Aug 09 16:43:12 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Aug 09 16:43:12 2017 -0700
tree 8a55742862be19c5ec81000d3754ee2e70d13d41
parent 13e613ec91571647ab53304368c0ec59064b446a
parent 195080c0a6056f8633e3e7d94d93d70242436a9e

Merge "sdm: Fix xlog permissions"

sdm/libs/core/fb/hw_device.cpp

diff --git a/sdm/libs/core/fb/hw_device.cpp b/sdm/libs/core/fb/hw_device.cpp
index 07bf5a9..eb0d17b 100644
--- a/sdm/libs/core/fb/hw_device.cpp
+++ b/sdm/libs/core/fb/hw_device.cpp
@@ -1369,7 +1369,7 @@
   std::ostringstream  dst;
   auto file = open(xlog_path, O_CREAT | O_TRUNC | O_DSYNC | O_RDWR, S_IRUSR | S_IWUSR | S_IRGRP);
   if (file < 0) {
-    DLOGE("Couldn't open file: err:%d (%s)",errno, strerror(errno));
+    DLOGE("Couldn't open file: err:%d (%s)", errno, strerror(errno));
     return kErrorResources;
   }
   dst << "+++ MDP:XLOG +++" << std::endl;

sdm/libs/hwc2/hwc_callbacks.cpp

diff --git a/sdm/libs/hwc2/hwc_callbacks.cpp b/sdm/libs/hwc2/hwc_callbacks.cpp
index 3be3bf6..48593f1 100644
--- a/sdm/libs/hwc2/hwc_callbacks.cpp
+++ b/sdm/libs/hwc2/hwc_callbacks.cpp
@@ -54,6 +54,7 @@
   if (!vsync_) {
     return HWC2::Error::NoResources;
   }
+  DTRACE_SCOPED();
   vsync_(vsync_data_, display, timestamp);
   return HWC2::Error::None;
 }

sdm/libs/hwc2/hwc_display.cpp

diff --git a/sdm/libs/hwc2/hwc_display.cpp b/sdm/libs/hwc2/hwc_display.cpp
index cf4d1a2..06d4749 100644
--- a/sdm/libs/hwc2/hwc_display.cpp
+++ b/sdm/libs/hwc2/hwc_display.cpp
@@ -102,6 +102,7 @@
 }
 
 HWC2::Error HWCColorMode::SetColorMode(android_color_mode_t mode) {
+  DTRACE_SCOPED();
   // first mode in 2D matrix is the mode (identity)
   if (color_mode_transform_map_.find(mode) == color_mode_transform_map_.end()) {
     DLOGE("Could not find mode: %d", mode);
@@ -129,6 +130,7 @@
     return HWC2::Error::BadParameter;
   }
 
+  DTRACE_SCOPED();
   double color_matrix[kColorTransformMatrixCount] = {0};
   CopyColorTransformMatrix(matrix, color_matrix);
 
@@ -625,6 +627,7 @@
 
 HWC2::Error HWCDisplay::SetVsyncEnabled(HWC2::Vsync enabled) {
   DLOGV("Display ID: %d enabled: %s", id_, to_string(enabled).c_str());
+  ATRACE_INT("SetVsyncState ", enabled == HWC2::Vsync::Enable ? 1 : 0);
   DisplayError error = kErrorNone;
 
   if (shutdown_pending_ || !callbacks_->VsyncCallbackRegistered()) {
@@ -688,6 +691,7 @@
       return HWC2::Error::BadParameter;
   }
 
+  ATRACE_INT("SetPowerMode ", state);
   DisplayError error = display_intf_->SetDisplayState(state);
   if (error == kErrorNone) {
     flush_on_error_ = flush_on_error;

sdm/libs/hwc2/hwc_layers.cpp

diff --git a/sdm/libs/hwc2/hwc_layers.cpp b/sdm/libs/hwc2/hwc_layers.cpp
index 6b5d470..a45fb1f 100644
--- a/sdm/libs/hwc2/hwc_layers.cpp
+++ b/sdm/libs/hwc2/hwc_layers.cpp
@@ -582,7 +582,7 @@
     }
   }
 
-  uint32_t fps = 0;
+  float fps = 0;
   if (getMetaData(handle, GET_REFRESH_RATE  , &fps) == 0) {
     layer->frame_rate = RoundToStandardFPS(fps);
   }