diff options
| author | Matt Szczesiak <matt.szczesiak@arm.com> | 2017-10-05 17:08:45 +0100 |
|---|---|---|
| committer | Ryan Harkin <ryan.harkin@linaro.org> | 2017-10-06 19:26:22 +0100 |
| commit | 0a5304e1d0afcc20abe00f92631f889afc5800ae (patch) | |
| tree | e486ad29591956a464a2f446e60d848dfd9ff70c | |
| parent | 618d9cb1670bdf465fe73faa1b0d3d5eb7fd2843 (diff) | |
ion: Update Juno ion device for latest CPA changesarm-juno-mali-fpga
The latest updates to Compound Page pool require platform data,
which defines the low/high/fill marks of the pool as well the
allocation page order and alignment. This commit adds example CPA
platform data for 2MB page allocations on Juno device.
Change-Id: I57287d4cfbe5ea254b42e0cd6573bfdf587cab6d
Signed-off-by: Matt Szczesiak <matt.szczesiak@arm.com>
| -rw-r--r-- | drivers/staging/android/ion/juno/juno_ion_dev.c | 9 | ||||
| -rw-r--r-- | linaro/configs/android.conf | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/drivers/staging/android/ion/juno/juno_ion_dev.c b/drivers/staging/android/ion/juno/juno_ion_dev.c index 7bdb34130ee..4c7c3c46cf3 100644 --- a/drivers/staging/android/ion/juno/juno_ion_dev.c +++ b/drivers/staging/android/ion/juno/juno_ion_dev.c @@ -26,6 +26,14 @@ struct platform_device juno_device_ion = { .id = -1, }; +static struct ion_cpa_platform_data cpa_config = { + .lowmark = 8, + .highmark = 128, + .fillmark = 64, + .align_order = 0, + .order = 9, +}; + struct ion_platform_heap juno_heaps[] = { { .id = ION_HEAP_TYPE_SYSTEM, @@ -47,6 +55,7 @@ struct ion_platform_heap juno_heaps[] = { .id = ION_HEAP_TYPE_COMPOUND_PAGE, .type = ION_HEAP_TYPE_COMPOUND_PAGE, .name = "compound_page", + .priv = &cpa_config, } }; diff --git a/linaro/configs/android.conf b/linaro/configs/android.conf index dcb814bdde3..07d1877d665 100644 --- a/linaro/configs/android.conf +++ b/linaro/configs/android.conf @@ -36,10 +36,6 @@ 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 |