[PATCH 1/4][Unstable][SRU Disco] UBUNTU: [Config] Bump CMA_SIZE_MBYTES to 32 on arm64

[dann frazier]

BugLink: http://bugs.launchpad.net/bugs/1823753

This aligns us with the upstream defconfig which was bumped to 32 for
the VC4 SoC in commit 7304a9a99d7b15fd69b3f00f7e16206bba110b35
("arm64: defconfig: Increase CMA size for VC4")

Signed-off-by: dann frazier <dann.frazier at canonical.com>
---
 debian.master/config/annotations          | 2 +-
 debian.master/config/config.common.ubuntu | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 008ead6f697cd..062688998114b 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -1484,7 +1484,7 @@ CONFIG_DEVTMPFS_MOUNT                           note<ENFORCED> note<upstart requ
 
 # Menu: Device Drivers >> Generic Driver Options >> DMA Contiguous Memory Allocator
 CONFIG_DMA_CMA                                  policy<{'amd64': 'n', 'arm64': 'y', 'armhf-generic': 'y', 'armhf-generic-lpae': 'n', 'i386': 'n', 's390x': 'n'}>
-CONFIG_CMA_SIZE_MBYTES                          policy<{'arm64': '16', 'armhf-generic': '16'}>
+CONFIG_CMA_SIZE_MBYTES                          policy<{'arm64': '32', 'armhf-generic': '16'}>
 CONFIG_CMA_ALIGNMENT                            policy<{'arm64': '8', 'armhf-generic': '8'}>
 #
 CONFIG_DMA_CMA                                  note<ENFORCED> note<LP#1362261> note<LP:1803206>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index df275aa4a69d3..6d5f4835a28bf 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1532,7 +1532,7 @@ CONFIG_CMA_ALIGNMENT=8
 CONFIG_CMA_AREAS=7
 # CONFIG_CMA_DEBUG is not set
 # CONFIG_CMA_DEBUGFS is not set
-CONFIG_CMA_SIZE_MBYTES=16
+CONFIG_CMA_SIZE_MBYTES=32
 # CONFIG_CMA_SIZE_SEL_MAX is not set
 CONFIG_CMA_SIZE_SEL_MBYTES=y
 # CONFIG_CMA_SIZE_SEL_MIN is not set
-- 
2.20.1