diff options
| author | Hanumant Singh <hanumant@codeaurora.org> | 2012-08-29 18:39:44 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:12:28 -0700 |
| commit | 80f4ce28762cef418fd87d26a764dc5d0621595a (patch) | |
| tree | 3d37030839f0dd27791ad40100a73fdfc4e23aed | |
| parent | c258eecae169cbbc3b4bf26a025260380760751d (diff) | |
ion: Port heap mask change to ion
Heap mask field passes as argument at allocation time to specify ion
heap.
Change-Id: I8881dfc491dc0f8f70581ad97b35756a6a33dd6d
Signed-off-by: Hanumant Singh <hanumant@codeaurora.org>
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_fb.c | 2 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_wb.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbdev/msm/mdss_fb.c b/drivers/video/fbdev/msm/mdss_fb.c index d2cb6577115a..eb7b4047d457 100644 --- a/drivers/video/fbdev/msm/mdss_fb.c +++ b/drivers/video/fbdev/msm/mdss_fb.c @@ -601,7 +601,7 @@ static int mdss_fb_alloc_fbmem(struct msm_fb_data_type *mfd) if (iclient) { mfd->ihdl = ion_alloc(iclient, size, SZ_4K, ION_HEAP(ION_CP_MM_HEAP_ID) | - ION_HEAP(ION_SF_HEAP_ID)); + ION_HEAP(ION_SF_HEAP_ID), 0); if (IS_ERR_OR_NULL(mfd->ihdl)) { pr_err("unable to alloc fbmem from ion (%p)\n", mfd->ihdl); diff --git a/drivers/video/fbdev/msm/mdss_mdp_wb.c b/drivers/video/fbdev/msm/mdss_mdp_wb.c index 1e472a95d430..d63950267f79 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_wb.c +++ b/drivers/video/fbdev/msm/mdss_mdp_wb.c @@ -86,7 +86,7 @@ struct mdss_mdp_data *mdss_mdp_wb_debug_buffer(struct msm_fb_data_type *mfd) ihdl = ion_alloc(iclient, img_size, SZ_4K, - ION_HEAP(ION_SF_HEAP_ID)); + ION_HEAP(ION_SF_HEAP_ID), 0); if (IS_ERR_OR_NULL(ihdl)) { pr_err("unable to alloc fbmem from ion (%p)\n", ihdl); return NULL; |