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 7e1652ef75e445b8daf02f742ac15a2080d242fe..2578b9b74d2ae2ede2396568cd9248e30b85efca 100755 (executable)
--- 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 1e6e30b449d99a6d4a289c08fe7024f04feb2060..2c1689bce3de520a6d89f9056428cc54473d7211 100755 (executable)
--- 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);