Merge "Move common display dump to gs-common" into udc-dev am: f122db3f24

Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/21644567

Change-Id: I789c9c5554c40c038d75261584b6ffed146e13c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 1 insertions, 22 deletions

diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp
index 0a46655..0c06f78 100644
--- a/dumpstate/Dumpstate.cpp
+++ b/dumpstate/Dumpstate.cpp
@@ -258,29 +258,8 @@ void Dumpstate::dumpTextSection(int fd, const std::string &sectionName) {
 
 // Dump items related to display
 void Dumpstate::dumpDisplaySection(int fd) {
-    // Dump counters for decon drivers
-    const std::string decon_device_sysfs_path("/sys/class/drm/card0/device/");
-    for(int i = 0; i <= 2; ++i){
-        const std::string decon_num_str = std::to_string(i);
-        const std::string decon_counter_path = decon_device_sysfs_path +
-                                              "decon" + decon_num_str +
-                                              "/counters";
-        if (access(decon_counter_path.c_str(), R_OK) == 0){
-            DumpFileToFd(fd, "DECON-" + decon_num_str + " counters",
-                         decon_counter_path);
-        }
-        else{
-            ::android::base::WriteStringToFd("No counters for DECON-" +
-                decon_num_str + " found at path (" + decon_counter_path + ")\n",
-                fd);
-        }
-    }
-    DumpFileToFd(fd, "CRTC-0 event log", "/sys/kernel/debug/dri/0/crtc-0/event");
+    DumpFileToFd(fd, "DECON-1 counters /sys/class/drm/card0/device/decon1/counters", "/sys/class/drm/card0/device/decon1/counters");
     DumpFileToFd(fd, "CRTC-1 event log", "/sys/kernel/debug/dri/0/crtc-1/event");
-    RunCommandToFd(fd, "libdisplaycolor", {"/vendor/bin/dumpsys", "displaycolor", "-v"},
-                   CommandOptions::WithTimeout(2).Build());
-    DumpFileToFd(fd, "Primary panel name", "/sys/devices/platform/exynos-drm/primary-panel/panel_name");
-    DumpFileToFd(fd, "Primary panel extra info", "/sys/devices/platform/exynos-drm/primary-panel/panel_extinfo");
     DumpFileToFd(fd, "Secondary panel name", "/sys/devices/platform/exynos-drm/secondary-panel/panel_name");
     DumpFileToFd(fd, "Secondary panel extra info", "/sys/devices/platform/exynos-drm/secondary-panel/panel_extinfo");
 }