diff options
author | Seungchul Kim <sc377.kim@samsung.com> | 2019-03-12 16:35:29 +0900 |
---|---|---|
committer | Weizhung Ding <weizhungding@google.com> | 2021-03-19 20:12:47 +0800 |
commit | 166d1ec4bb7918e6e31d27876adde3ddacad36ce (patch) | |
tree | 1feddc0f6238144f75eab57e253dfee3342d176a /libhwc2.1/libdisplayinterface/ExynosDeviceDrmInterface.cpp | |
parent | edc066233defe2cd3572eeca8729e06b241cdca7 (diff) |
libhwc2.1: modify concept of display's type and ID
Bug: 162322019
Test: single/dual display boot to OS, and suspend/resume
Change-Id: I4926f2b30abc2a9b4ddf1c47038ac7b9573213b1
Signed-off-by: Seungchul Kim <sc377.kim@samsung.com>
Signed-off-by: HyunKyung Kim <hk310.kim@samsung.com>
Diffstat (limited to 'libhwc2.1/libdisplayinterface/ExynosDeviceDrmInterface.cpp')
-rw-r--r-- | libhwc2.1/libdisplayinterface/ExynosDeviceDrmInterface.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libhwc2.1/libdisplayinterface/ExynosDeviceDrmInterface.cpp b/libhwc2.1/libdisplayinterface/ExynosDeviceDrmInterface.cpp index 992ff4b..4ca3e8d 100644 --- a/libhwc2.1/libdisplayinterface/ExynosDeviceDrmInterface.cpp +++ b/libhwc2.1/libdisplayinterface/ExynosDeviceDrmInterface.cpp @@ -86,12 +86,12 @@ void ExynosDeviceDrmInterface::init(ExynosDevice *exynosDevice) mExynosDrmEventHandler.init(mExynosDevice); mDrmDevice->event_listener()->RegisterHotplugHandler(static_cast<DrmEventHandler *>(&mExynosDrmEventHandler)); - ExynosDisplay *primaryDisplay = mExynosDevice->getDisplay(HWC_DISPLAY_PRIMARY); + ExynosDisplay *primaryDisplay = mExynosDevice->getDisplay(getDisplayId(HWC_DISPLAY_PRIMARY, 0)); if (primaryDisplay != NULL) { ExynosDisplayDrmInterface *displayInterface = static_cast<ExynosDisplayDrmInterface*>(primaryDisplay->mDisplayInterface.get()); displayInterface->initDrmDevice(mDrmDevice); } - ExynosDisplay *externalDisplay = mExynosDevice->getDisplay(HWC_DISPLAY_EXTERNAL); + ExynosDisplay *externalDisplay = mExynosDevice->getDisplay(getDisplayId(HWC_DISPLAY_EXTERNAL, 0)); if (externalDisplay != NULL) { ExynosDisplayDrmInterface *displayInterface = static_cast<ExynosDisplayDrmInterface*>(externalDisplay->mDisplayInterface.get()); displayInterface->initDrmDevice(mDrmDevice); @@ -199,7 +199,8 @@ void ExynosDeviceDrmInterface::ExynosDrmEventHandler::init(ExynosDevice *exynosD void ExynosDeviceDrmInterface::ExynosDrmEventHandler::HandleEvent(uint64_t timestamp_us) { /* TODO: Check plug status hear or ExynosExternalDisplay::handleHotplugEvent() */ - ExynosExternalDisplayModule *display = static_cast<ExynosExternalDisplayModule*>(mExynosDevice->getDisplay(HWC_DISPLAY_EXTERNAL)); + ExynosExternalDisplayModule *display = + static_cast<ExynosExternalDisplayModule*>(mExynosDevice->getDisplay(getDisplayId(HWC_DISPLAY_EXTERNAL, 0))); if (display != NULL) display->handleHotplugEvent(); } |