diff options
| author | Sergey Volk <servolk@google.com> | 2023-10-20 01:25:32 +0000 |
|---|---|---|
| committer | Sergey Volk <servolk@google.com> | 2023-10-20 20:17:10 +0000 |
| commit | ac27a862a41948ec8ad3f3090655121d3931e791 (patch) | |
| tree | 186d9e1f246b9fba133a421c33ec07ff3493111f | |
| parent | 6700e3138864d7fcc5390b38de6ce8d997871bb0 (diff) | |
| download | gs101-ac27a862a41948ec8ad3f3090655121d3931e791.tar.gz | |
Revert^2 "displaycolor: Add support for external displays"
Revert submission 25099667-revert-25035359-hwc-displaycolor-ext-display-DHMMOMYHKN
Reason for revert: The original CL was correct, just somehow landed in separate build from other CLs in the same topic.
Reverted changes: /q/submissionid:25099667-revert-25035359-hwc-displaycolor-ext-display-DHMMOMYHKN
Bug: 288608645
Bug: 306074705
Test: manual test on Pixel Fold, 6, 7, 8
Change-Id: I325554087bfcfcc99c54dd588f9a440f45035027
| -rw-r--r-- | libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterfaceModule.cpp | 26 |
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, |