From: hjc <hjc@rock-chips.com>
Date: Wed, 26 Mar 2014 02:10:34 +0000 (+0800)
Subject: rk fb: add fence function
X-Git-Tag: firefly_0821_release~5833
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d49bca4da8511bd1f5495025994df6f00ec57a29;p=firefly-linux-kernel-4.4.55.git

rk fb: add fence function
---

diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
index 3e0a49db5668..c5bb65a4d934 100755
--- 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 fa9c9d950ca7..c0027f501f5e 100755
--- 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;