ARM: dts: msm: Remove redundant/unused secure display CMA region for Waipio

The secure display region was kept around during the transition phase
from ION to dma-buf heaps. Now that the transition is complete, ION
has been removed, and the secure display region was absorbed into
the non-secure display region, we can remove the now unused region,
and stop including Lahaina's ION devicetree file.

Also, it has been observed that the kernel reorders the CMA regions
prior to allocating the memory for each region. This reordering can
cause smaller CMA regions to be allocated before bigger CMA regions,
resulting in failure to allocate the bigger CMA regions, as the memory
in the lower 4 GB becomes too fragmented. To mitigate this, assign a
region in memory to the non-secure CMA display region.

Change-Id: I27ca5b7115abd4620ae06ef588629f5fe19b020a
This commit is contained in:
Isaac J. Manjarres
2021-03-11 11:22:43 -08:00
parent d4238e8eb0
commit 106339b7a0

View File

@@ -564,6 +564,17 @@
reg = <0x0 0xed900000 0x0 0x3b00000>;
};
/*
* Statically determine address to ensure that this CMA area's
* allocation is not impacted by fragmentation from smaller regions
* being allocated first.
*/
non_secure_display_memory: non_secure_display_region {
compatible = "shared-dma-pool";
reusable;
reg = <0x0 0xf2800000 0x0 0xd800000>;
};
sp_mem: sp_region { /* SPSS-HLOS ION shared mem */
compatible = "shared-dma-pool";
alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
@@ -596,14 +607,6 @@
size = <0x0 0x1000000>;
};
secure_display_memory: secure_display_region { /* Secure UI */
compatible = "shared-dma-pool";
alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
reusable;
alignment = <0x0 0x400000>;
size = <0x0 0xA400000>;
};
cnss_wlan_mem: cnss_wlan_region {
compatible = "shared-dma-pool";
alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
@@ -612,14 +615,6 @@
size = <0x0 0x1400000>;
};
non_secure_display_memory: non_secure_display_region {
compatible = "shared-dma-pool";
alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
reusable;
alignment = <0x0 0x400000>;
size = <0x0 0xD800000>;
};
audio_cma_mem: audio_cma_region {
compatible = "shared-dma-pool";
alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
@@ -3325,7 +3320,6 @@
#include "waipio-usb.dtsi"
#include "waipio-coresight.dtsi"
#include "waipio-dma-heaps.dtsi"
#include "lahaina-ion.dtsi"
#include "waipio-debug.dtsi"
#include "waipio-eva.dtsi"
#include "waipio-audio.dtsi"