From 2a8a57b08e1d8890bb35495f1cc0bd5a137ccd11 Mon Sep 17 00:00:00 2001
From: Newbyte <newbie13xd@gmail.com>
Date: Fri, 2 Jun 2023 15:01:08 +0200
Subject: [PATCH] linux-postmarketos-stericsson: allocate 128 MB of CMA memory
 (MR 4144)

Closes https://gitlab.com/postmarketOS/pmaports/-/issues/1220

[ci:skip-build] Already build-tested on CI
---
 .../testing/linux-postmarketos-stericsson/APKBUILD  |  4 ++--
 .../config-postmarketos-stericsson.armv7            | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/device/testing/linux-postmarketos-stericsson/APKBUILD b/device/testing/linux-postmarketos-stericsson/APKBUILD
index af730a4a6..87ae07024 100644
--- a/device/testing/linux-postmarketos-stericsson/APKBUILD
+++ b/device/testing/linux-postmarketos-stericsson/APKBUILD
@@ -5,7 +5,7 @@ _flavor="postmarketos-stericsson"
 _config="config-$_flavor.armv7"
 pkgname=linux-$_flavor
 pkgver=6.3.5
-pkgrel=0
+pkgrel=1
 pkgdesc="Mainline kernel for ST-Ericsson NovaThor devices"
 arch="armv7"
 _carch="arm"
@@ -68,7 +68,7 @@ package() {
 
 sha512sums="
 91a98c56191645c4ba32f657da59b6be92021b37a698eaf79e1ed3a79b959626386e7b69c8cb0c9eab0645c287a3e53393b1710158eca67b2f66a8d3eaec13de  linux-6.3.5.tar.xz
-16c4b7327fce72d9c05c669fffb8ace4bf51c3093f2167383ee638dc3f26b11ffb50567030443b43fd5903b1284effdab10e64d007c2c06793743dbd46780c87  config-postmarketos-stericsson.armv7
+9760c63cbe1319363df137c641d24bfd9c054f5bcee26977fa996baa912511ee119950bcce87e583412ade626bba6dd6cc2139cedb4670f2bf6eda79e294e057  config-postmarketos-stericsson.armv7
 10df6cacbed7b76d23a879aea4b9913b22551a6e4f9cd49814f491af4b8121dccbae4b3f1400584917f071355bdcd298f900b712ce31905c4ec561247dbb14e0  0001-fix-busydetect-ux500.patch
 3abf1a2b28077a2784c33f468facf44c2312f8bb54422463cffcb92a0eaa1f8954f1fa5f8f5acac0262495c08692a2161325c1ca68f7d23aecb36c1f9138d7ef  0002-pwm-ab8500-Get-HW-ID-from-reg-value.patch
 "
diff --git a/device/testing/linux-postmarketos-stericsson/config-postmarketos-stericsson.armv7 b/device/testing/linux-postmarketos-stericsson/config-postmarketos-stericsson.armv7
index 8c3779a21..6827833c5 100644
--- a/device/testing/linux-postmarketos-stericsson/config-postmarketos-stericsson.armv7
+++ b/device/testing/linux-postmarketos-stericsson/config-postmarketos-stericsson.armv7
@@ -5405,7 +5405,18 @@ CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
 CONFIG_DMA_NONCOHERENT_MMAP=y
-# CONFIG_DMA_CMA is not set
+CONFIG_DMA_CMA=y
+# CONFIG_DMA_PERNUMA_CMA is not set
+
+#
+# Default contiguous memory area size:
+#
+CONFIG_CMA_SIZE_MBYTES=128
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_ALIGNMENT=8
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
 CONFIG_SGL_ALLOC=y