Merge "libhwc2.1: correct config state and vsync period" into tm-dev

1 files changed, 4 insertions, 1 deletions

diff --git a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp
index 303033f..82286a1 100644
--- a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp
+++ b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp
@@ -696,7 +696,7 @@ void ExynosDisplayDrmInterface::Callback(
 
         if (configApplied) {
             if (mVsyncCallback.getDesiredVsyncPeriod()) {
-                mExynosDisplay->resetConfigRequestStateLocked();
+                mExynosDisplay->resetConfigRequestStateLocked(mActiveModeState.mode.id());
                 mDrmConnector->set_active_mode(mActiveModeState.mode);
                 mVsyncCallback.resetDesiredVsyncPeriod();
             }
@@ -1068,6 +1068,9 @@ int32_t ExynosDisplayDrmInterface::setActiveConfigWithConstraints(
     if ((mActiveModeState.blob_id != 0) &&
         (mActiveModeState.mode.id() == config)) {
         ALOGD("%s:: same mode %d", __func__, config);
+        /* trigger resetConfigRequestStateLocked() */
+        mVsyncCallback.setDesiredVsyncPeriod(nsecsPerSec / mActiveModeState.mode.v_refresh());
+        mDrmVSyncWorker.VSyncControl(true);
         return HWC2_ERROR_NONE;
     }