Merge cherrypicks of [20206687] into tm-qpr1-release.android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-release

Change-Id: I5a2b745e9943166ce33bf5146033d06d3e2b60a2

1 files changed, 5 insertions, 1 deletions

diff --git a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp
index bb940ad..1984d7b 100644
--- a/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp
+++ b/libhwc2.1/libdisplayinterface/ExynosDisplayDrmInterface.cpp
@@ -1094,7 +1094,11 @@ int32_t ExynosDisplayDrmInterface::setActiveConfigWithConstraints(
             (mActiveModeState.blob_id != 0) && mActiveModeState.isFullModeSwitch(*mode);
 
     if (!test) {
-        mDesiredModeState.setMode(*mode, modeBlob, drmReq);
+        if (modeBlob) { /* only replace desired mode if it has changed */
+            mDesiredModeState.setMode(*mode, modeBlob, drmReq);
+        } else {
+            ALOGD("%s:: same desired mode %d", __func__, config);
+        }
     } else {
         if (!isResSwitch) {
             ret = setDisplayMode(drmReq, modeBlob ? modeBlob : mDesiredModeState.blob_id);