diff options
| author | Weizhung Ding <weizhungding@google.com> | 2021-03-23 01:07:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-03-23 01:07:54 +0000 |
| commit | 9c0ad2965b36942e39dddbce59ef3703ba43f86b (patch) | |
| tree | 4d4e60aaf54bef0a5bb37179308c5e81a550fcaf /libhwc2.1/libmaindisplay | |
| parent | 54a8d971fd4b2bb21708a5a780d1608296520b12 (diff) | |
| parent | b34f290be29ca38a9a50d918afe6dd3daaae4fee (diff) | |
| download | gs101-9c0ad2965b36942e39dddbce59ef3703ba43f86b.tar.gz | |
Merge changes from topic "dual_display" into sc-dev
* changes:
libhwc2.1: Clean up code related to multi display
libhwc2.1: Change function name for readability
libhwc2.1: Disable forceReserveMPP
libhwc2.1: Reserve DPP to the specific display
libhwc2.1: Check if display interface is valid
libhwc2.1: Support dual display
libhwc2.1: support multi display with resource table
libhwc2.1: add display define table and arrange code
libhwc2.1: Modify concept of display's type and ID
Diffstat (limited to 'libhwc2.1/libmaindisplay')
| -rw-r--r-- | libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp | 8 | ||||
| -rw-r--r-- | libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp index b92fffb..fdb8db8 100644 --- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp +++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.cpp @@ -43,8 +43,8 @@ inline bool operator==(const ExynosPrimaryDisplayModule::DisplaySceneInfo::Layer return lm1.dppIdx == lm2.dppIdx && lm1.planeId == lm2.planeId; } -ExynosPrimaryDisplayModule::ExynosPrimaryDisplayModule(uint32_t __unused type, ExynosDevice *device) - : ExynosPrimaryDisplay(HWC_DISPLAY_PRIMARY, device), mDisplayColorLoader(DISPLAY_COLOR_LIB) +ExynosPrimaryDisplayModule::ExynosPrimaryDisplayModule(uint32_t index, ExynosDevice *device) + : ExynosPrimaryDisplay(index, device), mDisplayColorLoader(DISPLAY_COLOR_LIB) { #ifdef FORCE_GPU_COMPOSITION exynosHWCControl.forceGpu = true; @@ -111,10 +111,8 @@ int32_t ExynosPrimaryDisplayModule::validateWinConfigData() void ExynosPrimaryDisplayModule::doPreProcessing() { ExynosDisplay::doPreProcessing(); - ExynosDisplay *externalDisplay = mDevice->getDisplay(HWC_DISPLAY_EXTERNAL); - ExynosDisplay *virtualDisplay = mDevice->getDisplay(HWC_DISPLAY_VIRTUAL); - if ((externalDisplay->mPlugState) || (virtualDisplay->mPlugState)) { + if (mDevice->checkNonInternalConnection()) { mDisplayControl.adjustDisplayFrame = true; } else { mDisplayControl.adjustDisplayFrame = false; diff --git a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h index 4af7f1c..34ffc95 100644 --- a/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h +++ b/libhwc2.1/libmaindisplay/ExynosPrimaryDisplayModule.h @@ -91,7 +91,7 @@ using namespace displaycolor; class ExynosPrimaryDisplayModule : public ExynosPrimaryDisplay { public: - ExynosPrimaryDisplayModule(uint32_t type, ExynosDevice *device); + ExynosPrimaryDisplayModule(uint32_t index, ExynosDevice *device); ~ExynosPrimaryDisplayModule(); void usePreDefinedWindow(bool use); virtual int32_t validateWinConfigData(); |