From: Huang Jiachai <hjc@rock-chips.com>
Date: Mon, 14 Nov 2016 01:07:17 +0000 (+0800)
Subject: video: rockchip: fb: add more debug message
X-Git-Tag: firefly_0821_release~1083
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fa7ef80efbe643b3f91ba05fc4d0ab4e99f26cc0;p=firefly-linux-kernel-4.4.55.git

video: rockchip: fb: add more debug message

Change-Id: Id096dec3a60cee14fecd16f37407fa10f8d8b90e
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 29cb535a510c..c053315dd4c2 100644
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@ -1831,8 +1831,18 @@ static int rk_fb_reg_effect(struct rk_lcdc_driver *dev_drv,
 				if (dev_drv->ops->get_win_state) {
 					win_status =
 					dev_drv->ops->get_win_state(dev_drv, i, j);
-					if (win_status)
+					if (win_status) {
 						wait_for_vsync = true;
+						dev_info(dev_drv->dev,
+							 "win[%d]area[%d]: "
+							 "state: %d, "
+							 "cur state: %d,"
+							 "count: %d\n",
+							 i, j,
+							 dev_drv->win[i]->area[j].state,
+							 win_status,
+							 101 - count);
+					}
 				}
 			} else {
 				pr_err("!!!win[%d]state:%d,error!!!\n",
@@ -1986,7 +1996,8 @@ static void rk_fb_update_reg(struct rk_lcdc_driver *dev_drv,
 		timeout = wait_event_interruptible_timeout(dev_drv->vsync_info.wait,
 				ktime_compare(dev_drv->vsync_info.timestamp, timestamp) > 0,
 				msecs_to_jiffies(50));
-
+		if (timeout <= 0)
+			dev_info(dev_drv->dev, "timeout: %ld\n", timeout);
 		wait_for_vsync = rk_fb_reg_effect(dev_drv, regs, count);
 	} while (wait_for_vsync && count--);
 #ifdef H_USE_FENCE
@@ -2111,6 +2122,8 @@ static int rk_fb_config_debug(struct rk_lcdc_driver *dev_drv,
 			rk_fb_dbg(cmd, "	   xact=%d,yact=%d,xvir=%d,yvir=%d\n",
 				  area_par->xact, area_par->yact,
 				  area_par->xvir, area_par->yvir);
+			rk_fb_dbg(cmd, "	   data_space%d\n",
+				  area_par->data_space);
 		}
 	}
 
@@ -3595,8 +3608,10 @@ int rk_fb_switch_screen(struct rk_screen *screen, int enable, int lcdc_id)
 			dev_drv->id);
 	if (enable == 2 /*&& dev_drv->enable*/)
 		return 0;
-	pr_info("switch:en=%d,lcdc_id=%d,screen type=%d,cur type=%d\n",
+	pr_info("switch:en=%d,lcdc_id=%d,screen type=%d,cur type=%d",
 		enable, lcdc_id, screen->type, dev_drv->cur_screen->type);
+	pr_info("data space: %d, color mode: %d\n",
+		screen->data_space, screen->color_mode);
 
 	mutex_lock(&dev_drv->switch_screen);
 	dev_drv->hot_plug_state = enable;