commit 5a1cbf03b7bb2d73635f6e468c6ea23bef15fdcd
author Linux Build Service Account <lnxbuild@localhost> Fri Jun 15 20:45:31 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jun 15 20:45:31 2018 -0700
tree 15ae4a09b507b1938a0a1d1cdd33cbd4642b709e
parent eec9681a895463ef739a60a6989798c29932fc53
parent 43859db679a54206f048f14821c2e88704c5df5a

Merge "hwc: Fix typo" into display.lnx.5.0

config/msmnile.mk

diff --git a/config/msmnile.mk b/config/msmnile.mk
index 6e4339d..896a1a8 100644
--- a/config/msmnile.mk
+++ b/config/msmnile.mk
@@ -43,5 +43,4 @@
     vendor.display.enable_null_display=0 \
     vendor.display.disable_excl_rect=0 \
     vendor.display.comp_mask=0 \
-    vendor.display.disable_hw_recovery=1 \
-    vendor.display.enable_default_color_mode=1
+    vendor.display.disable_hw_recovery=1

libdrmutils/drm_interface.h

diff --git a/libdrmutils/drm_interface.h b/libdrmutils/drm_interface.h
index 91d6194..b71a097 100644
--- a/libdrmutils/drm_interface.h
+++ b/libdrmutils/drm_interface.h
@@ -371,6 +371,11 @@
    *      uint64_t - Pointer to feature config data
    */
   DPPS_CACHE_FEATURE,
+  /*
+   * Op: Commit Dpps features.
+   * Arg: drmModeAtomicReq - Atomic request
+   */
+  DPPS_COMMIT_FEATURE,
 };
 
 enum struct DRMRotation {

sdm/libs/core/drm/hw_device_drm.cpp

diff --git a/sdm/libs/core/drm/hw_device_drm.cpp b/sdm/libs/core/drm/hw_device_drm.cpp
index 9d2fc6a..1401aef 100644
--- a/sdm/libs/core/drm/hw_device_drm.cpp
+++ b/sdm/libs/core/drm/hw_device_drm.cpp
@@ -996,6 +996,7 @@
                             qos_data.rot_prefill_bw_bps);
   drm_atomic_intf_->Perform(DRMOps::CRTC_SET_ROT_CLK, token_.crtc_id, qos_data.rot_clock_hz);
   drm_atomic_intf_->Perform(DRMOps::CRTC_SET_SECURITY_LEVEL, token_.crtc_id, crtc_security_level);
+  drm_atomic_intf_->Perform(DRMOps::DPPS_COMMIT_FEATURE, 0 /* argument is not used */);
 
   if (!validate) {
     drm_atomic_intf_->Perform(DRMOps::CRTC_GET_RELEASE_FENCE, token_.crtc_id, &release_fence_);