msm-fb: display: ion framework support
Add support for the ION memory manager
to the framebuffer driver
Change-Id: If012dcdbbc71eb0f7d4d429ad4789b3276d34a58
Signed-off-by: Nagamalleswararao Ganji <nganji@codeaurora.org>
Signed-off-by: Naseer Ahmed <naseer@codeaurora.org>
diff --git a/drivers/video/msm/msm_fb.c b/drivers/video/msm/msm_fb.c
index 7595838..10e4156 100644
--- a/drivers/video/msm/msm_fb.c
+++ b/drivers/video/msm/msm_fb.c
@@ -2526,8 +2526,6 @@
int ret;
struct msmfb_overlay_data req;
struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
- struct file *p_src_file = 0;
- struct file *p_src_plane1_file = 0, *p_src_plane2_file = 0;
if (mfd->overlay_play_enable == 0) /* nothing to do */
return 0;
@@ -2549,17 +2547,7 @@
add_timer(&mfd->msmfb_no_update_notify_timer);
mutex_unlock(&msm_fb_notify_update_sem);
- ret = mdp4_overlay_play(info, &req, &p_src_file, &p_src_plane1_file,
- &p_src_plane2_file);
-
-#ifdef CONFIG_ANDROID_PMEM
- if (p_src_file)
- put_pmem_file(p_src_file);
- if (p_src_plane1_file)
- put_pmem_file(p_src_plane1_file);
- if (p_src_plane2_file)
- put_pmem_file(p_src_plane2_file);
-#endif
+ ret = mdp4_overlay_play(info, &req);
return ret;
}
@@ -3304,7 +3292,9 @@
mfd->fb_page = fb_num;
mfd->index = fbi_list_index;
mfd->mdp_fb_page_protection = MDP_FB_PAGE_PROTECTION_WRITECOMBINE;
-
+#ifdef CONFIG_MSM_MULTIMEDIA_USE_ION
+ mfd->client = msm_ion_client_create(-1, pdev->name);
+#endif
/* link to the latest pdev */
mfd->pdev = this_dev;