Evolution-X-Tensor/device_google_gs101
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move display dump to gs-common am: 78bbc7d5f8

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/21803645

Change-Id: I43ccbe63b2f23b2dc0c6aa16cf3978fab5d60eae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Adam Shih 2023-03-09 05:29:17 +00:00 • committed by Automerger Merge Worker
commit e15403f139
3 changed files with 1 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

1
device.mk
View file

@ -23,6 +23,7 @@ include device/google/gs-common/aoc/aoc.mk
include device/google/gs-common/thermal/thermal.mk include device/google/gs-common/thermal/thermal.mk
include device/google/gs-common/pixel_metrics/pixel_metrics.mk include device/google/gs-common/pixel_metrics/pixel_metrics.mk
include device/google/gs-common/performance/perf.mk include device/google/gs-common/performance/perf.mk
include device/google/gs-common/display/dump.mk
TARGET_BOARD_PLATFORM := gs101 TARGET_BOARD_PLATFORM := gs101
DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false) DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false)

42
dumpstate/Dumpstate.cpp
View file

@ -244,7 +244,6 @@ Dumpstate::Dumpstate()
{ "memory", [this](int fd) { dumpMemorySection(fd); } }, { "memory", [this](int fd) { dumpMemorySection(fd); } },
{ "Devfreq", [this](int fd) { dumpDevfreqSection(fd); } }, { "Devfreq", [this](int fd) { dumpDevfreqSection(fd); } },
{ "power", [this](int fd) { dumpPowerSection(fd); } }, { "power", [this](int fd) { dumpPowerSection(fd); } },
{ "display", [this](int fd) { dumpDisplaySection(fd); } },
{ "camera", [this](int fd) { dumpCameraSection(fd); } }, { "camera", [this](int fd) { dumpCameraSection(fd); } },
} { } {
} }
@ -529,47 +528,6 @@ void Dumpstate::dumpMemorySection(int fd) {
"done"}); "done"});
} }
// 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, "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 extra info", "/sys/devices/platform/exynos-drm/primary-panel/panel_extinfo");
DumpFileToFd(fd, "secondary panel extra info", "/sys/devices/platform/exynos-drm/secondary-panel/panel_extinfo");
if (!PropertiesHelper::IsUserBuild()) {
RunCommandToFd(fd, "HWC Fence States", {"/vendor/bin/sh", "-c",
"for f in $(ls /data/vendor/log/hwc/*_hwc_fence_state*.txt); do "
"echo $f ; cat $f ; done"},
CommandOptions::WithTimeout(2).Build());
RunCommandToFd(fd, "HWC Error Logs", {"/vendor/bin/sh", "-c",
"for f in $(ls /data/vendor/log/hwc/*_hwc_error_log*.txt); do "
"echo $f ; cat $f ; done"},
CommandOptions::WithTimeout(2).Build());
RunCommandToFd(fd, "HWC Debug Dumps", {"/vendor/bin/sh", "-c",
"for f in $(ls /data/vendor/log/hwc/*_hwc_debug*.dump); do "
"echo $f ; cat $f ; done"},
CommandOptions::WithTimeout(2).Build());
}
}
// Dump essential camera debugging logs // Dump essential camera debugging logs
void Dumpstate::dumpCameraSection(int fd) { void Dumpstate::dumpCameraSection(int fd) {
RunCommandToFd(fd, "Camera HAL Graph State Dump", {"/vendor/bin/sh", "-c", RunCommandToFd(fd, "Camera HAL Graph State Dump", {"/vendor/bin/sh", "-c",

1
dumpstate/Dumpstate.h
View file

@ -50,7 +50,6 @@ class Dumpstate : public BnDumpstateDevice {
void dumpPowerSection(int fd); void dumpPowerSection(int fd);
void dumpDevfreqSection(int fd); void dumpDevfreqSection(int fd);
void dumpMemorySection(int fd); void dumpMemorySection(int fd);
void dumpDisplaySection(int fd);
void dumpCameraSection(int fd); void dumpCameraSection(int fd);
}; };