diff options
| author | Ziyan <jaraidaniel@gmail.com> | 2015-10-15 22:26:24 +0200 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2016-01-05 18:20:40 +0100 |
| commit | d441a294e5edc35a5e85cef6ab716dfea9ccb24e (patch) | |
| tree | 3184665ef5dccdf8eaadae253d47c981cc754a4c /arch/arm | |
| parent | 9a292d29696d8de5c07f9c3c0bfeb84202fa9522 (diff) | |
| download | kernel_samsung_tuna-d441a294e5edc35a5e85cef6ab716dfea9ccb24e.zip kernel_samsung_tuna-d441a294e5edc35a5e85cef6ab716dfea9ccb24e.tar.gz kernel_samsung_tuna-d441a294e5edc35a5e85cef6ab716dfea9ccb24e.tar.bz2 | |
tuna: add omaplfb platform data
This allows us to disable the unused nonsecure tiler2d carveout (10 mb).
Since the freed carveout memory will be added to tiler2d, we can lower its carveout size by this amount.
Change-Id: I12b0eb55a4bbb2f6dc251697d93c96fc574cc472
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/cyanogenmod_tuna_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/tuna_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-tuna-display.c | 20 |
3 files changed, 21 insertions, 3 deletions
diff --git a/arch/arm/configs/cyanogenmod_tuna_defconfig b/arch/arm/configs/cyanogenmod_tuna_defconfig index 96c430e..b52a647 100644 --- a/arch/arm/configs/cyanogenmod_tuna_defconfig +++ b/arch/arm/configs/cyanogenmod_tuna_defconfig @@ -306,7 +306,7 @@ CONFIG_OMAP_REMOTEPROC_MEMPOOL_SIZE=0x0 # CONFIG_OMAP_PM_NONE is not set # CONFIG_OMAP_PM_NOOP is not set CONFIG_OMAP_PM=y -CONFIG_ION_OMAP_TILER2D_SIZE=80 +CONFIG_ION_OMAP_TILER2D_SIZE=70 # # TI OMAP2/3/4 Specific Features diff --git a/arch/arm/configs/tuna_defconfig b/arch/arm/configs/tuna_defconfig index 43b2f89..fa1a34f 100644 --- a/arch/arm/configs/tuna_defconfig +++ b/arch/arm/configs/tuna_defconfig @@ -306,7 +306,7 @@ CONFIG_OMAP_REMOTEPROC_MEMPOOL_SIZE=0x0 # CONFIG_OMAP_PM_NONE is not set # CONFIG_OMAP_PM_NOOP is not set CONFIG_OMAP_PM=y -CONFIG_ION_OMAP_TILER2D_SIZE=80 +CONFIG_ION_OMAP_TILER2D_SIZE=70 # # TI OMAP2/3/4 Specific Features diff --git a/arch/arm/mach-omap2/board-tuna-display.c b/arch/arm/mach-omap2/board-tuna-display.c index 0aea1b4..95f2eae 100644 --- a/arch/arm/mach-omap2/board-tuna-display.c +++ b/arch/arm/mach-omap2/board-tuna-display.c @@ -1063,11 +1063,29 @@ static struct omapfb_platform_data tuna_fb_pdata = { }, }; +#if defined(CONFIG_FB_OMAP2_NUM_FBS) +#define OMAPLFB_NUM_DEV CONFIG_FB_OMAP2_NUM_FBS +#else +#define OMAPLFB_NUM_DEV 1 +#endif + +static struct sgx_omaplfb_config omaplfb_config_tuna[OMAPLFB_NUM_DEV] = { + { + .vram_buffers = 2, + .swap_chain_length = 2, + } +}; + +static struct sgx_omaplfb_platform_data tuna_omaplfb_plat_data = { + .num_configs = OMAPLFB_NUM_DEV, + .configs = omaplfb_config_tuna, +}; + void tuna_android_display_setup(struct omap_ion_platform_data *ion) { omap_android_display_setup(&tuna_dss_data, NULL, - NULL, + &tuna_omaplfb_plat_data, &tuna_fb_pdata, ion); } |