rk fb: add fence function

diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
index 3e0a49db56680badbfeb199374fd8b6a49525e4b..c5bb65a4d9342d57487a26b4a98242f978f3dc62 100755 (executable)
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@ -51,7 +51,7 @@
 #include <linux/dma-buf.h>
 #endif
 #endif
-
+#define H_USE_FENCE 1
 static int hdmi_switch_complete;
 static struct platform_device *fb_pdev;
 struct list_head saved_list;

diff --git a/include/linux/rk_fb.h b/include/linux/rk_fb.h
index fa9c9d950ca773dd782063b873e18a1ab3f28ba7..c0027f501f5e586558aed7938116f7a2cedbd7b8 100755 (executable)
--- a/include/linux/rk_fb.h
+++ b/include/linux/rk_fb.h
@@ -378,9 +378,9 @@ struct rk_lcdc_drv_ops {
 };
 
 struct rk_fb_area_par {
-       u16 ion_fd;
+       int ion_fd;
        unsigned long phy_addr;
-       u16 acq_fence_fd;
+       int acq_fence_fd;
        u32 x_offset;
        u32 y_offset;
        u32 xpos;               /*start point in panel  --->LCDC_WINx_DSP_ST*/
@@ -404,8 +404,8 @@ struct rk_fb_win_par {
 };
 
 struct rk_fb_win_cfg_data {
-       u16 ret_fence_fd;
-       u16 rel_fence_fd[RK_MAX_BUF_NUM];
+       int ret_fence_fd;
+       int rel_fence_fd[RK_MAX_BUF_NUM];
        struct  rk_fb_win_par win_par[RK30_MAX_LAYER_SUPPORT];
        struct  rk_lcdc_post_cfg post_cfg;
        u8      wait_fs;