From 66866dcfe4b52ab4ff19db5eec0bbe42862bb73c Mon Sep 17 00:00:00 2001 From: Xinliang Liu Date: Mon, 16 Nov 2015 11:06:30 +0800 Subject: [PATCH] Revert "dts: hi6220: Move cma size configuration to 'reserved-memory' dts node" This reverts commit 434b1d5d210ddb4f47f31896dee1336dc5350014. Revert this to fix latest 2G board can't startup to Debian destkop. Anyway, we are enabling iommu now. After we enable it, there is no need to reserve cma heap for graphic usage. --- arch/arm64/boot/dts/hi6220-hikey.dts | 10 ---------- arch/arm64/configs/defconfig | 1 + 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/arch/arm64/boot/dts/hi6220-hikey.dts b/arch/arm64/boot/dts/hi6220-hikey.dts index 8c9d6de9039e23..3c13965ec9cd45 100644 --- a/arch/arm64/boot/dts/hi6220-hikey.dts +++ b/arch/arm64/boot/dts/hi6220-hikey.dts @@ -56,16 +56,6 @@ no-map; reg = <0x0 0x06dff000 0x0 0x00001000>; /* Mailbox message buf */ }; - - /* global autoconfigured region for contiguous allocations - * e.g. for graphic usage */ - linux,cma { - compatible = "shared-dma-pool"; - reusable; - size = <0x0 0x8000000>; /* 128M */ - alignment = <0x0 0x2000>; /* 4k page alignment */ - linux,cma-default; - }; }; smb { diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 67305977f98d97..c68ede08c49cd0 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -208,6 +208,7 @@ CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y CONFIG_DMA_CMA=y +CONFIG_CMA_SIZE_MBYTES=128 CONFIG_CONNECTOR=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y