diff options
author | Ramesh Garimella <quic_rgarimel@quicinc.com> | 2022-04-22 06:59:48 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-04-22 06:59:48 +0000 |
commit | 8aa2ae5a0c5255de801c25529b77574bd8661fac (patch) | |
tree | 86c5cb916a2c3a2a0e7b66c6a68193b93a4e06c0 | |
parent | 7902a486e64faa3b72ed67e956591075f5a55616 (diff) | |
parent | a6baf36795ff3fda57d8bb2a0e06f423caf65bf5 (diff) |
Merge "sf: acquire mStateLock to access mCurrentState" into s-keystone-qcom-dev
-rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 78 |
1 files changed, 46 insertions, 32 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 3fe89ad96a..6dc2c6d809 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -5028,46 +5028,60 @@ void SurfaceFlinger::applyTransactionState(const FrameTimelineInfo& frameTimelin } void SurfaceFlinger::checkVirtualDisplayHint(const Vector<DisplayState>& displays) { - for (const DisplayState& s : displays) { - const ssize_t index = mCurrentState.displays.indexOfKey(s.token); - if (index < 0) - continue; + int width = 0, height = 0, format = 0; +#ifdef QTI_DISPLAY_CONFIG_ENABLED + bool createVirtualDisplay = false; +#endif + + { + Mutex::Autolock _l(mStateLock); + for (const DisplayState& s : displays) { + const ssize_t index = mCurrentState.displays.indexOfKey(s.token); + if (index < 0) + continue; - DisplayDeviceState& state = mCurrentState.displays.editValueAt(index); - const uint32_t what = s.what; - if (what & DisplayState::eSurfaceChanged) { - if (IInterface::asBinder(state.surface) != IInterface::asBinder(s.surface)) { - if (state.isVirtual() && s.surface != nullptr && - mVirtualDisplayIdGenerators.hal) { - int width = 0; - int status = s.surface->query(NATIVE_WINDOW_WIDTH, &width); - ALOGE_IF(status != NO_ERROR, "Unable to query width (%d)", status); - int height = 0; - status = s.surface->query(NATIVE_WINDOW_HEIGHT, &height); - ALOGE_IF(status != NO_ERROR, "Unable to query height (%d)", status); - int format = 0; - status = s.surface->query(NATIVE_WINDOW_FORMAT, &format); - ALOGE_IF(status != NO_ERROR, "Unable to query format (%d)", status); + DisplayDeviceState& state = mCurrentState.displays.editValueAt(index); + const uint32_t what = s.what; + if (what & DisplayState::eSurfaceChanged) { + if (IInterface::asBinder(state.surface) != IInterface::asBinder(s.surface)) { + if (state.isVirtual() && s.surface != nullptr && + mVirtualDisplayIdGenerators.hal) { + width = 0; + int status = s.surface->query(NATIVE_WINDOW_WIDTH, &width); + ALOGE_IF(status != NO_ERROR, "Unable to query width (%d)", status); + height = 0; + status = s.surface->query(NATIVE_WINDOW_HEIGHT, &height); + ALOGE_IF(status != NO_ERROR, "Unable to query height (%d)", status); + format = 0; + status = s.surface->query(NATIVE_WINDOW_FORMAT, &format); + ALOGE_IF(status != NO_ERROR, "Unable to query format (%d)", status); #ifdef QTI_DISPLAY_CONFIG_ENABLED - size_t maxVirtualDisplaySize = - getHwComposer().getMaxVirtualDisplayDimension(); - if ((mDisplayConfigIntf) && (maxVirtualDisplaySize == 0 || - ((uint64_t)width <= maxVirtualDisplaySize && - (uint64_t)height <= maxVirtualDisplaySize))) { - uint64_t usage = 0; - // Replace with native_window_get_consumer_usage ? - status = s.surface->getConsumerUsage(&usage); - ALOGW_IF(status != NO_ERROR, "Unable to query usage (%d)", status); - if ((status == NO_ERROR) && canAllocateHwcDisplayIdForVDS(usage)) { - mDisplayConfigIntf->CreateVirtualDisplay(width, height, format); - return; + size_t maxVirtualDisplaySize = + getHwComposer().getMaxVirtualDisplayDimension(); + if ((mDisplayConfigIntf) && (maxVirtualDisplaySize == 0 || + ((uint64_t)width <= maxVirtualDisplaySize && + (uint64_t)height <= maxVirtualDisplaySize))) { + uint64_t usage = 0; + // Replace with native_window_get_consumer_usage ? + status = s.surface->getConsumerUsage(&usage); + ALOGW_IF(status != NO_ERROR, "Unable to query usage (%d)", status); + if ((status == NO_ERROR) && canAllocateHwcDisplayIdForVDS(usage)) { + createVirtualDisplay = true; + break; + } } - } #endif + } } } } } + +#ifdef QTI_DISPLAY_CONFIG_ENABLED + if(createVirtualDisplay) { + mDisplayConfigIntf->CreateVirtualDisplay(width, height, format); + } +#endif } uint32_t SurfaceFlinger::setDisplayStateLocked(const DisplayState& s) { |