[PATCH] arm64: dts: hikey: extend default cma size to 128MB

To support display in Debian on HiKey, cma heap is used to allocate
graphic buffers. The default size of CMA is 16 MB which is not enought.

Increase the default CMA size to 128 MB.

cc: Rob Herring <redacted>
cc: Fathi Boudra <redacted>
cc: John Stultz <redacted>
cc: Xinliang Liu <xinliang.liu@linaro.org>
Signed-off-by: Guodong Xu <redacted>
---
 arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
index 4a51058..abb3434 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts

@@ -45,6 +45,20 @@
 		      <0x00000000 0x22000000 0x00000000 0x1c000000>;
 	};
 
+	reserved-memory {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+
+		/* global autoconfigured region for contiguous allocations */
+		linux,cma {
+			compatible = "shared-dma-pool";
+			reusable;
+			size = <0x00000000 0x08000000>;
+			linux,cma-default;
+		};
+	};
+
 	pstore: pstore at 0x21f00000 {
 		no-map;
 		reg = <0x0 0x21f00000 0x0 0x00100000>;  /* pstore/ramoops buffer */

-- 
1.9.1

On Wed, Aug 24, 2016 at 8:35 AM, Guodong Xu [off-list ref] wrote:

To support display in Debian on HiKey, cma heap is used to allocate
graphic buffers. The default size of CMA is 16 MB which is not enought.

s/enought/enough/

So what is upstream (as of 4.8) for ramoops also uses reserved-memory,
so you should separately fix this.

Acked-by: Rob Herring <robh@kernel.org>

Rob

On 24 August 2016 at 23:10, Rob Herring [off-list ref] wrote:

On Wed, Aug 24, 2016 at 8:35 AM, Guodong Xu [off-list ref] wrote:

quoted

To support display in Debian on HiKey, cma heap is used to allocate
graphic buffers. The default size of CMA is 16 MB which is not enought.

s/enought/enough/

quoted

Increase the default CMA size to 128 MB.

cc: Rob Herring <redacted>
cc: Fathi Boudra <redacted>
cc: John Stultz <redacted>
cc: Xinliang Liu <xinliang.liu@linaro.org>
Signed-off-by: Guodong Xu <redacted>
---
 arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
index 4a51058..abb3434 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts

@@ -45,6 +45,20 @@
                      <0x00000000 0x22000000 0x00000000 0x1c000000>;
        };

+       reserved-memory {
+               #address-cells = <2>;
+               #size-cells = <2>;
+               ranges;
+
+               /* global autoconfigured region for contiguous allocations */
+               linux,cma {
+                       compatible = "shared-dma-pool";
+                       reusable;
+                       size = <0x00000000 0x08000000>;
+                       linux,cma-default;
+               };
+       };
+
        pstore: pstore at 0x21f00000 {

So what is upstream (as of 4.8) for ramoops also uses reserved-memory,
so you should separately fix this.

Got it. I will fix and resend.

Acked-by: Rob Herring <robh@kernel.org>

Thanks.
-Guodong

Rob