summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-10-24 01:21:08 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-10-24 01:21:08 +0000
commit5c0465df10aaf6820013958762813e1ce4d94b20 (patch)
tree186d9e1f246b9fba133a421c33ec07ff3493111f
parente569930a20c0123eccf69a096549bf8cbe8d9a33 (diff)
parente11cf7771e7c07a03b4e48bbf4be341dff6cac92 (diff)
downloadgs101-5c0465df10aaf6820013958762813e1ce4d94b20.tar.gz
Snap for 10992821 from e11cf7771e7c07a03b4e48bbf4be341dff6cac92 to 24Q1-release
Change-Id: I72c7f1117deea7a30ed7dc58d70b8915868284e7
-rw-r--r--libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp26
1 files changed, 19 insertions, 7 deletions
diff --git a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp
index 9d5f1c1..5e19626 100644
--- a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp
+++ b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp
@@ -440,14 +440,26 @@ uint32_t ExynosDisplayDrmInterfaceModule::SaveBlob::getBlob(uint32_t type)
void ExynosDisplayDrmInterfaceModule::getDisplayInfo(
std::vector<displaycolor::DisplayInfo> &display_info) {
- displaycolor::DisplayInfo primary_display;
-
- primary_display.brightness_ranges =
- mExynosDisplay->mBrightnessController->getBrightnessRanges();
- primary_display.panel_name = GetPanelName();
- primary_display.panel_serial = GetPanelSerial();
+ displaycolor::DisplayInfo disp_info;
+
+ disp_info.brightness_ranges = mExynosDisplay->mBrightnessController->getBrightnessRanges();
+ if (mExynosDisplay->mType == HWC_DISPLAY_PRIMARY) {
+ disp_info.panel_name = GetPanelName();
+ disp_info.panel_serial = GetPanelSerial();
+ if (mExynosDisplay->mIndex == 0)
+ disp_info.display_type = DisplayType::DISPLAY_PRIMARY;
+ else
+ disp_info.display_type = DisplayType::DISPLAY_SECONDARY;
+ } else if (mExynosDisplay->mType == HWC_DISPLAY_EXTERNAL) {
+ disp_info.display_type = DisplayType::DISPLAY_EXTERNAL;
+ disp_info.panel_name = "external_display";
+ disp_info.panel_serial = "0001";
+ } else {
+ ALOGE("Unsupported display type (%d) in getDisplayInfo!", mExynosDisplay->mType);
+ return;
+ }
- display_info.push_back(primary_display);
+ display_info.push_back(disp_info);
}
const std::string ExynosDisplayDrmInterfaceModule::GetPanelInfo(const std::string &sysfs_rel,