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

Move display dump to gs-common

Browse source 
Bug: 269212897
Test: adb bugreport
Change-Id: I7b17d4d54e90429d07b545e3d53c3f528155dab5
This commit is contained in:
Adam Shih 2023-03-07 11:48:05 +08:00
parent 9f413fc11b
commit fe0605b2b1
3 changed files with 2 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

2
device.mk
View file

@ -23,6 +23,8 @@ 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 := gs201 TARGET_BOARD_PLATFORM := gs201
AB_OTA_POSTINSTALL_CONFIG += \ AB_OTA_POSTINSTALL_CONFIG += \

44
dumpstate/Dumpstate.cpp
View file

@ -217,7 +217,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); } },
{ "pixel-trace", [this](int fd) { dumpPixelTraceSection(fd); } }, { "pixel-trace", [this](int fd) { dumpPixelTraceSection(fd); } },
}, },
mLogSections{ mLogSections{
@ -529,49 +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 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");
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());
}
}
void Dumpstate::dumpModemLogs(int fd, const std::string &destDir) { void Dumpstate::dumpModemLogs(int fd, const std::string &destDir) {
std::string extendedLogDir = MODEM_EXTENDED_LOG_DIRECTORY; std::string extendedLogDir = MODEM_EXTENDED_LOG_DIRECTORY;
std::string modemLogHistoryDir = MODEM_LOG_HISTORY_DIRECTORY; std::string modemLogHistoryDir = MODEM_LOG_HISTORY_DIRECTORY;

1
dumpstate/Dumpstate.h
View file

@ -56,7 +56,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 dumpPixelTraceSection(int fd); void dumpPixelTraceSection(int fd);
void dumpLogSection(int fd, int fdModem); void dumpLogSection(int fd, int fdModem);