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

display-dump: update project-specific crtc sysfs node

Browse source 
Refactor and rename project-specific dump

Bug: 376426334
Test: adb bugreport
Test: adb shell /vendor/bin/dump/dump_*_display
Test: adb shell /vendor/bin/dump/dump_*_second_display
Flag: EXEMPT bugfix
Change-Id: I7bf470e5784e0fd726c49823b55aae6235aceaec
This commit is contained in:
Hung-Yeh Lee 2024-12-19 13:10:37 +08:00
parent 5a51adbdd3
commit bbe22a1056
11 changed files with 103 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

40
display/Android.bp
View file

@ -4,14 +4,14 @@ package {
sh_binary {
name: "dump_display_userdebug.sh",
src: "dump_display_userdebug.sh",
src: "common/dump_display_userdebug.sh",
vendor: true,
sub_dir: "dump",
}
cc_binary {
name: "dump_display",
srcs: ["dump_display.cpp"],
name: "dump_exynos_display",
srcs: ["exynos/dump_display.cpp"],
cflags: [
"-Wall",
"-Wextra",
@ -26,8 +26,8 @@ cc_binary {
}
cc_binary {
name: "dump_second_display",
srcs: ["dump_second_display.cpp"],
name: "dump_exynos_second_display",
srcs: ["exynos/dump_second_display.cpp"],
cflags: [
"-Wall",
"-Wextra",
@ -40,3 +40,33 @@ cc_binary {
relative_install_path: "dump",
}
cc_binary {
name: "dump_pixel_display",
srcs: ["pixel/dump_display.cpp"],
cflags: [
"-Wall",
"-Wextra",
"-Werror",
],
shared_libs: [
"libbase",
"libdump",
],
vendor: true,
relative_install_path: "dump",
}
cc_binary {
name: "dump_pixel_second_display",
srcs: ["pixel/dump_second_display.cpp"],
cflags: [
"-Wall",
"-Wextra",
"-Werror",
],
shared_libs: [
"libdump",
],
vendor: true,
relative_install_path: "dump",
}

0
display/dump_display_userdebug.sh → display/common/dump_display_userdebug.sh
View file

4
display/dump_exynos_display.mk Normal file
View file

@ -0,0 +1,4 @@
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/display/sepolicy/exynos
PRODUCT_PACKAGES_DEBUG += dump_display_userdebug.sh
PRODUCT_PACKAGES += dump_exynos_display

3
display/dump_exynos_second_display.mk Normal file
View file

@ -0,0 +1,3 @@
PRODUCT_PACKAGES += dump_exynos_second_display
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/display/sepolicy_second_display/exynos

4
display/dump.mk → display/dump_pixel_display.mk
View file

@ -1,4 +1,4 @@
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/display/sepolicy
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/display/sepolicy/pixel
PRODUCT_PACKAGES_DEBUG += dump_display_userdebug.sh
PRODUCT_PACKAGES += dump_display
PRODUCT_PACKAGES += dump_pixel_display

3
display/dump_pixel_second_display.mk Normal file
View file

@ -0,0 +1,3 @@
PRODUCT_PACKAGES += dump_pixel_second_display
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/display/sepolicy_second_display/pixel

3
display/dump_second_display.mk
View file

@ -1,3 +0,0 @@
PRODUCT_PACKAGES += dump_second_display
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/display/sepolicy_second_display

2
display/dump_display.cpp → display/exynos/dump_display.cpp
View file

@ -18,7 +18,7 @@
int main() {
setbuf(stdout, NULL);
dumpFileContent("DECON-0 counters /sys/class/drm/card0/device/decon0/counters", "/sys/class/drm/card0/device/decon0/counters");
dumpFileContent("DECON-0 counters", "/sys/class/drm/card0/device/decon0/counters");
dumpFileContent("CRTC-0 event log", "/sys/kernel/debug/dri/0/crtc-0/event");
runCommand("libdisplaycolor", "/vendor/bin/dumpsys displaycolor -v");

2
display/dump_second_display.cpp → display/exynos/dump_second_display.cpp
View file

@ -16,7 +16,7 @@
#include <dump/pixel_dump.h>
int main() {
dumpFileContent("DECON-1 counters /sys/class/drm/card0/device/decon1/counters", "/sys/class/drm/card0/device/decon1/counters");
dumpFileContent("DECON-1 counters", "/sys/class/drm/card0/device/decon1/counters");
dumpFileContent("CRTC-1 event log", "/sys/kernel/debug/dri/0/crtc-1/event");
dumpFileContent("Secondary panel name", "/sys/class/drm/card0/device/secondary-panel/panel_name");

29
display/pixel/dump_display.cpp Normal file
View file

@ -0,0 +1,29 @@
/*
* Copyright 2022 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <dump/pixel_dump.h>
#include <android-base/file.h>
int main() {
setbuf(stdout, NULL);
dumpFileContent("CRTC-0 status", "/sys/kernel/debug/dri/0/crtc-0/status");
runCommand("libdisplaycolor", "/vendor/bin/dumpsys displaycolor -v");
dumpFileContent("Primary panel name", "/sys/class/drm/card0/device/primary-panel/panel_name");
dumpFileContent("Primary panel extra info", "/sys/class/drm/card0/device/primary-panel/panel_extinfo");
dumpFileContent("Primary panel power Vreg", "/sys/class/drm/card0/device/primary-panel/panel_pwr_vreg");
dumpFileContent("Primary panel power mode register", "/sys/class/drm/card0/device/primary-panel/power_mode");
return 0;
}

25
display/pixel/dump_second_display.cpp Normal file
View file

@ -0,0 +1,25 @@
/*
* Copyright 2022 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <dump/pixel_dump.h>
int main() {
dumpFileContent("CRTC-1 status", "/sys/kernel/debug/dri/0/crtc-1/status");
dumpFileContent("Secondary panel name", "/sys/class/drm/card0/device/secondary-panel/panel_name");
dumpFileContent("Secondary panel extra info", "/sys/class/drm/card0/device/secondary-panel/panel_extinfo");
dumpFileContent("Secondary panel power mode register", "/sys/class/drm/card0/device/secondary-panel/power_mode");
return 0;
}