commit 2c2d8a92507f74e88ea8cd4b658a32441d0dafa0
author Linux Build Service Account <lnxbuild@localhost> Mon Jun 25 11:18:28 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Jun 25 11:18:28 2018 -0700
tree 0e3b6b7f487f20585bf560296c7012a14144bc0c
parent d5d5b285dffdc32166e5d41e1be7c7c64f73d446
parent 1d00aa5bc7616327f51361112749f2dab8479763

Merge "sdm: Reduce the fb_id cache limit for UI layers"

gralloc/gr_utils.h

diff --git a/gralloc/gr_utils.h b/gralloc/gr_utils.h
index 11ce5f7..7e2d1fa 100644
--- a/gralloc/gr_utils.h
+++ b/gralloc/gr_utils.h
@@ -43,7 +43,7 @@
 
 #ifdef SLAVE_SIDE_CP
 #define SECURE_ALIGN SZ_1M
-#else // MASTER_SIDE_CP
+#else  // MASTER_SIDE_CP
 #define SECURE_ALIGN SZ_4K
 #endif
 

include/display_properties.h

diff --git a/include/display_properties.h b/include/display_properties.h
index 799eade..ef440cd 100644
--- a/include/display_properties.h
+++ b/include/display_properties.h
@@ -104,6 +104,7 @@
 #define QDCM_PCC_TRANS_PROP                  DISPLAY_PROP("qdcm.pcc_for_trans")
 #define QDCM_DIAGONAL_MATRIXMODE_PROP        DISPLAY_PROP("qdcm.diagonal_matrix_mode")
 #define QDCM_DISABLE_TIMEOUT_PROP            PERSIST_DISPLAY_PROP("qdcm.disable_timeout")
+#define QDCM_MODE_COMBINE_PROP               DISPLAY_PROP("qdcm.mode_combine")
 
 #define ZERO_SWAP_INTERVAL                   "vendor.debug.egl.swapinterval"