Revert "SF: Flow DisplayModeRequest through mode set FSM"
This reverts commit aaab4c3b4f012f48bca428b9db1cd954a6fbc8e9.
Reason for revert: b/317378302
Change-Id: I516f52c41d27d9ea3eca969a3f786d2115521dac
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 7230547..2769e5d 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -59,7 +59,6 @@
#include <ftl/concat.h>
#include <ftl/fake_guard.h>
#include <ftl/future.h>
-#include <ftl/match.h>
#include <ftl/unit.h>
#include <gui/AidlStatusUtil.h>
#include <gui/BufferQueue.h>
@@ -1230,21 +1229,20 @@
return NO_ERROR;
}
-void SurfaceFlinger::setDesiredMode(display::DisplayModeRequest&& desiredMode, bool force) {
- const auto mode = desiredMode.mode;
- const auto displayId = mode.modePtr->getPhysicalDisplayId();
-
+void SurfaceFlinger::setDesiredMode(display::DisplayModeRequest&& request, bool force) {
+ const auto displayId = request.mode.modePtr->getPhysicalDisplayId();
ATRACE_NAME(ftl::Concat(__func__, ' ', displayId.value).c_str());
const auto display = getDisplayDeviceLocked(displayId);
if (!display) {
- ALOGW("%s: Unknown display %s", __func__, to_string(displayId).c_str());
+ ALOGW("%s: display is no longer valid", __func__);
return;
}
- const bool emitEvent = desiredMode.emitEvent;
+ const auto mode = request.mode;
+ const bool emitEvent = request.emitEvent;
- switch (display->setDesiredMode(std::move(desiredMode), force)) {
+ switch (display->setDesiredMode(std::move(request), force)) {
case DisplayDevice::DesiredModeAction::InitiateDisplayModeSwitch:
// DisplayDevice::setDesiredMode updated the render rate, so inform Scheduler.
mScheduler->setRenderRate(displayId,
@@ -1340,55 +1338,61 @@
const auto displayId = display.getPhysicalId();
ATRACE_NAME(ftl::Concat(__func__, ' ', displayId.value).c_str());
- ftl::match(
- display.finalizeModeChange(),
- [this, displayId](DisplayDevice::RefreshRateChange change) {
- ftl::FakeGuard guard(mStateLock);
+ const auto pendingModeOpt = display.getPendingMode();
+ if (!pendingModeOpt) {
+ // There is no pending mode change. This can happen if the active
+ // display changed and the mode change happened on a different display.
+ return;
+ }
- if (change.activeMode.emitEvent) {
- dispatchDisplayModeChangeEvent(displayId, change.activeMode.mode);
- }
+ const auto& activeMode = pendingModeOpt->mode;
- applyActiveMode(std::move(change.activeMode));
- },
- [&](DisplayDevice::ResolutionChange change) {
- auto& state = mCurrentState.displays.editValueFor(display.getDisplayToken());
- // Assign a new sequence ID to recreate the display and so its framebuffer.
- state.sequenceId = DisplayDeviceState{}.sequenceId;
- state.physical->activeMode = change.activeMode.mode.modePtr.get();
+ if (display.getActiveMode().modePtr->getResolution() != activeMode.modePtr->getResolution()) {
+ auto& state = mCurrentState.displays.editValueFor(display.getDisplayToken());
+ // We need to generate new sequenceId in order to recreate the display (and this
+ // way the framebuffer).
+ state.sequenceId = DisplayDeviceState{}.sequenceId;
+ state.physical->activeMode = activeMode.modePtr.get();
+ processDisplayChangesLocked();
- ftl::FakeGuard guard1(kMainThreadContext);
- ftl::FakeGuard guard2(mStateLock);
- processDisplayChangesLocked();
+ // processDisplayChangesLocked will update all necessary components so we're done here.
+ return;
+ }
- applyActiveMode(std::move(change.activeMode));
- },
- [](DisplayDevice::NoModeChange noChange) {
- // TODO(b/255635821): Remove this case, as it should no longer happen.
- ALOGE("A mode change was initiated but not finalized: %s", noChange.reason);
- });
+ display.finalizeModeChange(activeMode.modePtr->getId(), activeMode.modePtr->getVsyncRate(),
+ activeMode.fps);
+
+ if (displayId == mActiveDisplayId) {
+ mRefreshRateStats->setRefreshRate(activeMode.fps);
+ updatePhaseConfiguration(activeMode.fps);
+ }
+
+ if (pendingModeOpt->emitEvent) {
+ dispatchDisplayModeChangeEvent(displayId, activeMode);
+ }
}
-void SurfaceFlinger::dropModeRequest(display::DisplayModeRequest&& request) {
- if (request.mode.modePtr->getPhysicalDisplayId() == mActiveDisplayId) {
+void SurfaceFlinger::dropModeRequest(const sp<DisplayDevice>& display) {
+ display->clearDesiredMode();
+ if (display->getPhysicalId() == mActiveDisplayId) {
// TODO(b/255635711): Check for pending mode changes on other displays.
mScheduler->setModeChangePending(false);
}
}
-void SurfaceFlinger::applyActiveMode(display::DisplayModeRequest&& activeMode) {
- auto activeModePtr = activeMode.mode.modePtr;
+void SurfaceFlinger::applyActiveMode(const sp<DisplayDevice>& display) {
+ const auto activeModeOpt = display->getDesiredMode();
+ auto activeModePtr = activeModeOpt->mode.modePtr;
const auto displayId = activeModePtr->getPhysicalDisplayId();
- const auto renderFps = activeMode.mode.fps;
+ const auto renderFps = activeModeOpt->mode.fps;
- dropModeRequest(std::move(activeMode));
+ dropModeRequest(display);
constexpr bool kAllowToEnable = true;
mScheduler->resyncToHardwareVsync(displayId, kAllowToEnable, std::move(activeModePtr).take());
mScheduler->setRenderRate(displayId, renderFps);
if (displayId == mActiveDisplayId) {
- mRefreshRateStats->setRefreshRate(renderFps);
updatePhaseConfiguration(renderFps);
}
}
@@ -1402,50 +1406,50 @@
const auto display = getDisplayDeviceLocked(id);
if (!display) continue;
- auto desiredModeOpt = display->takeDesiredMode();
+ auto desiredModeOpt = display->getDesiredMode();
if (!desiredModeOpt) {
continue;
}
- auto desiredMode = std::move(*desiredModeOpt);
-
if (!shouldApplyRefreshRateSelectorPolicy(*display)) {
- dropModeRequest(std::move(desiredMode));
+ dropModeRequest(display);
continue;
}
- const auto desiredModeId = desiredMode.mode.modePtr->getId();
+ const auto desiredModeId = desiredModeOpt->mode.modePtr->getId();
const auto displayModePtrOpt = physical.snapshot().displayModes().get(desiredModeId);
if (!displayModePtrOpt) {
- ALOGW("%s: Unknown mode %d for display %s", __func__, desiredModeId.value(),
- to_string(id).c_str());
- dropModeRequest(std::move(desiredMode));
+ ALOGW("Desired display mode is no longer supported. Mode ID = %d",
+ desiredModeId.value());
+ dropModeRequest(display);
continue;
}
- if (display->getActiveMode() == desiredMode.mode) {
- dropModeRequest(std::move(desiredMode));
+ ALOGV("%s changing active mode to %d(%s) for display %s", __func__, desiredModeId.value(),
+ to_string(displayModePtrOpt->get()->getVsyncRate()).c_str(),
+ to_string(display->getId()).c_str());
+
+ if (display->getActiveMode() == desiredModeOpt->mode) {
+ applyActiveMode(display);
continue;
}
- // The desired mode is different from the active mode. However, the allowed modes might have
- // changed since setDesiredMode scheduled a mode transition.
- if (!display->refreshRateSelector().isModeAllowed(desiredMode.mode)) {
- dropModeRequest(std::move(desiredMode));
+ // Desired active mode was set, it is different than the mode currently in use, however
+ // allowed modes might have changed by the time we process the refresh.
+ // Make sure the desired mode is still allowed
+ if (!display->refreshRateSelector().isModeAllowed(desiredModeOpt->mode)) {
+ dropModeRequest(display);
continue;
}
- ALOGV("Mode setting display %s to %d (%s)", to_string(id).c_str(), desiredModeId.value(),
- to_string(displayModePtrOpt.value().get()->getVsyncRate()).c_str());
-
- // TODO(b/142753666): Use constraints.
+ // TODO(b/142753666) use constrains
hal::VsyncPeriodChangeConstraints constraints;
constraints.desiredTimeNanos = systemTime();
constraints.seamlessRequired = false;
hal::VsyncPeriodChangeTimeline outTimeline;
- if (!display->initiateModeChange(std::move(desiredMode), constraints, outTimeline)) {
+ if (!display->initiateModeChange(std::move(*desiredModeOpt), constraints, outTimeline)) {
continue;
}
@@ -1465,6 +1469,11 @@
if (displayToUpdateImmediately) {
const auto display = getDisplayDeviceLocked(*displayToUpdateImmediately);
finalizeDisplayModeChange(*display);
+
+ const auto desiredModeOpt = display->getDesiredMode();
+ if (desiredModeOpt && display->getActiveMode() == desiredModeOpt->mode) {
+ applyActiveMode(display);
+ }
}
}
@@ -7382,7 +7391,7 @@
if (!updateOverlay) return;
// Update the overlay on the main thread to avoid race conditions with
- // RefreshRateSelector::getActiveMode.
+ // RefreshRateSelector::getActiveMode
static_cast<void>(mScheduler->schedule([=, this] {
const auto display = FTL_FAKE_GUARD(mStateLock, getDefaultDisplayDeviceLocked());
if (!display) {