summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Einar Reitan <john.reitan@arm.com>2016-01-13 09:25:52 +0100
committerJohn Einar Reitan <john.reitan@arm.com>2016-01-15 11:04:44 +0100
commit2e086788b11fe6428b289aa99363b2de1c8f57da (patch)
tree27be6ce0a73cf8f902b4b97faa0f098af2313f53
parentcbf003119fa4785dea78c708e1b2bde2823491e7 (diff)
downloadkernel-2e086788b11fe6428b289aa99363b2de1c8f57da.tar.gz
ion: Integrate Compound Page Pool
Change-Id: I62f50e2c33006734a23a3794cabec3dd9bf305c8 Signed-off-by: John Einar Reitan <john.reitan@arm.com>
-rw-r--r--drivers/staging/android/ion/juno/juno_ion_dev.c8
-rw-r--r--linaro/configs/android.conf6
2 files changed, 13 insertions, 1 deletions
diff --git a/drivers/staging/android/ion/juno/juno_ion_dev.c b/drivers/staging/android/ion/juno/juno_ion_dev.c
index cee6be3ce3f..7bdb34130ee 100644
--- a/drivers/staging/android/ion/juno/juno_ion_dev.c
+++ b/drivers/staging/android/ion/juno/juno_ion_dev.c
@@ -42,11 +42,17 @@ struct ion_platform_heap juno_heaps[] = {
.type = ION_HEAP_TYPE_DMA,
.name = "ion_dma_heap-3",
.priv = &juno_device_ion.dev,
+ },
+ {
+ .id = ION_HEAP_TYPE_COMPOUND_PAGE,
+ .type = ION_HEAP_TYPE_COMPOUND_PAGE,
+ .name = "compound_page",
}
+
};
struct ion_platform_data juno_ion_pdata = {
- .nr = 3,
+ .nr = ARRAY_SIZE(juno_heaps),
.heaps = juno_heaps,
};
diff --git a/linaro/configs/android.conf b/linaro/configs/android.conf
index 3357d86430a..dcb814bdde3 100644
--- a/linaro/configs/android.conf
+++ b/linaro/configs/android.conf
@@ -35,6 +35,12 @@ CONFIG_SW_SYNC=y
CONFIG_SW_SYNC_USER=y
CONFIG_ION_TEST=y
CONFIG_ION_JUNO=y
+CONFIG_ION_COMPOUND_PAGE=y
+CONFIG_ION_COMPOUND_PAGE_SIZE=9
+CONFIG_ION_COMPOUND_PAGE_LOWMARK=16
+CONFIG_ION_COMPOUND_PAGE_FILLMARK=32
+CONFIG_ION_COMPOUND_PAGE_HIGHMARK=128
+CONFIG_ION_COMPOUND_PAGE_STATS=y
CONFIG_ADF=y
CONFIG_ADF_FBDEV=y
CONFIG_ADF_MEMBLOCK=y