From: yxj <yxj@rock-chips.com>
Date: Tue, 11 Feb 2014 07:26:04 +0000 (+0800)
Subject: rk fb:use ion interface export by rockchip ion
X-Git-Tag: firefly_0821_release~6337
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8f02f3e354e3f770be0287e5631c4ca9ddec432b;p=firefly-linux-kernel-4.4.55.git

rk fb:use ion interface export by rockchip ion
---

diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
index 7e1652ef75e4..2578b9b74d2a 100755
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@ -1578,7 +1578,7 @@ static int rk_fb_alloc_buffer(struct fb_info *fbi, int fb_id)
 		fb_mem_size = 3 * (fbi->var.xres * fbi->var.yres) << 2;
 		fb_mem_size = ALIGN(fb_mem_size, SZ_1M);
 #if defined(CONFIG_ION_ROCKCHIP)
-		handle = ion_alloc(rk_fb->ion_client, (size_t)fb_mem_size, 0, 2, 0);
+		handle = ion_alloc(rk_fb->ion_client, (size_t)fb_mem_size, 0, ION_HEAP(ION_VIDEO_HEAP_ID), 0);
 		if (IS_ERR(handle)) {
 			dev_err(fbi->device, "failed to ion_alloc:%ld\n",PTR_ERR(handle));
 			return -ENOMEM;
@@ -1969,7 +1969,7 @@ static int rk_fb_probe(struct platform_device *pdev)
 	}
 	dev_set_name(&pdev->dev, "rockchip-fb");
 #if defined(CONFIG_ION_ROCKCHIP)
-	rk_fb->ion_client = ion_client_create(ion_rockchip,"rk_fb");
+	rk_fb->ion_client = rockchip_ion_client_create("rk_fb");
 	if (IS_ERR(rk_fb->ion_client)) {
 		dev_err(&pdev->dev, "failed to create ion client for rk fb");
 		return PTR_ERR(rk_fb->ion_client);
diff --git a/include/linux/rk_fb.h b/include/linux/rk_fb.h
index 1e6e30b449d9..2c1689bce3de 100755
--- a/include/linux/rk_fb.h
+++ b/include/linux/rk_fb.h
@@ -69,7 +69,7 @@
 #define RK_LF_MAX_TIMEOUT 			 (1600000UL << 6)	//>0.64s
 
 #if defined(CONFIG_ION_ROCKCHIP)
-extern struct ion_device *ion_rockchip;
+extern struct ion_client *rockchip_ion_client_create(const char * name);
 #endif
 
 extern int rk_fb_poll_prmry_screen_vblank(void);