From: Huang Jiachai <hjc@rock-chips.com>
Date: Tue, 15 Mar 2016 01:10:19 +0000 (+0800)
Subject: video: rockchip: fb: rename time line name for vop0 and vop1
X-Git-Tag: firefly_0821_release~3107
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9e55fbe4803a8504554f35c6e612e63a84b0d13b;p=firefly-linux-kernel-4.4.55.git

video: rockchip: fb: rename time line name for vop0 and vop1

Change-Id: Ifae7d4fc88dd41ecb659c886237a6d65026fded6
Signed-off-by: Huang Jiachai <hjc@rock-chips.com>
---

diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
index 0e0a3d2b25a9..47e2c78e7f00 100644
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@ -4102,6 +4102,7 @@ int rk_fb_register(struct rk_lcdc_driver *dev_drv,
 	struct rk_fb_par *fb_par = NULL;
 	int i = 0, ret = 0, index = 0;
 	unsigned long flags;
+	char time_line_name[16];
 
 	if (rk_fb->num_lcdc == RK30_MAX_LCDC_SUPPORT)
 		return -ENXIO;
@@ -4203,8 +4204,10 @@ int rk_fb_register(struct rk_lcdc_driver *dev_drv,
 			init_kthread_work(&dev_drv->update_regs_work,
 					  rk_fb_update_regs_handler);
 
+			snprintf(time_line_name, sizeof(time_line_name),
+				 "vop%d-timeline", id);
 			dev_drv->timeline =
-			    sw_sync_timeline_create("fb-timeline");
+			    sw_sync_timeline_create(time_line_name);
 			dev_drv->timeline_max = 1;
 		}
 	}