From patchwork Tue Jul 24 04:09:44 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: "Manjunathappa, Prakash" <prakash.pm@ti.com>
X-Patchwork-Id: 1230171
Return-Path: 
 <davinci-linux-open-source-bounces+patchwork-davinci=patchwork.kernel.org@linux.davincidsp.com>
X-Original-To: patchwork-davinci@patchwork.kernel.org
Delivered-To: patchwork-process-083081@patchwork1.kernel.org
Received: from arroyo.ext.ti.com (arroyo.ext.ti.com [192.94.94.40])
	by patchwork1.kernel.org (Postfix) with ESMTP id 86D643FD48
	for <patchwork-davinci@patchwork.kernel.org>;
	Tue, 24 Jul 2012 04:24:27 +0000 (UTC)
Received: from dlelxv30.itg.ti.com ([172.17.2.17])
	by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id q6O4OPsx026905
	for <patchwork-davinci@patchwork.kernel.org>;
	Mon, 23 Jul 2012 23:24:25 -0500
Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110])
	by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id q6O4OPCD004962
	for <patchwork-davinci@patchwork.kernel.org>;
	Mon, 23 Jul 2012 23:24:25 -0500
Received: from dlelxv23.itg.ti.com (172.17.1.198) by dfle73.ent.ti.com
	(128.247.5.110) with Microsoft SMTP Server id 14.1.323.3;
	Mon, 23 Jul 2012 23:24:24 -0500
Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31])	by
	dlelxv23.itg.ti.com (8.13.8/8.13.8) with ESMTP id q6O4OOkV017583	for
	<patchwork-davinci@patchwork.kernel.org>;
	Mon, 23 Jul 2012 23:24:25 -0500
Received: from linux.omap.com (localhost [127.0.0.1])	by linux.omap.com
	(Postfix) with ESMTP id 85A4380630	for
	<patchwork-davinci@patchwork.kernel.org>;
	Mon, 23 Jul 2012 23:24:24 -0500 (CDT)
X-Original-To: davinci-linux-open-source@linux.davincidsp.com
Delivered-To: davinci-linux-open-source@linux.davincidsp.com
Received: from dbdp20.itg.ti.com (dbdp20.itg.ti.com [172.24.170.38])	by
	linux.omap.com (Postfix) with ESMTP id 7C38780626	for
	<davinci-linux-open-source@linux.davincidsp.com>;
	Mon, 23 Jul 2012 23:24:18 -0500 (CDT)
Received: from DBDE71.ent.ti.com (localhost [127.0.0.1])	by dbdp20.itg.ti.com
	(8.13.8/8.13.8) with ESMTP id q6O4OFxN020853;
	Tue, 24 Jul 2012 09:54:16 +0530 (IST)
Received: from dbdp32.itg.ti.com (172.24.170.251) by DBDE71.ent.ti.com
	(172.24.170.149) with Microsoft SMTP Server id 14.1.323.3;
	Tue, 24 Jul 2012 09:54:15 +0530
Received: from ucmsshproxy.india.ext.ti.com (dbdp20.itg.ti.com
	[172.24.170.38])	by dbdp32.itg.ti.com (8.13.8/8.13.8) with SMTP id
	q6O4OEm4013387;	Tue, 24 Jul 2012 09:54:15 +0530
Received: from symphony.india.ext.ti.com (unknown [192.168.247.13])	by
	ucmsshproxy.india.ext.ti.com (Postfix) with ESMTP	id 64A56158002;
	Tue, 24 Jul 2012 09:54:14 +0530 (IST)
Received: from linux-psp-server.india.ext.ti.com (linux-psp-server
	[192.168.247.76])	by symphony.india.ext.ti.com
	(8.11.7p1+Sun/8.11.7)	with
	ESMTP id q6O4ODI16867;	Tue, 24 Jul 2012 09:54:13 +0530 (IST)
From: "Manjunathappa, Prakash" <prakash.pm@ti.com>
To: <linux-fbdev@vger.kernel.org>
Subject: [PATCH v2] da8xx-fb: allow frame to complete after disabling LCDC
Date: Tue, 24 Jul 2012 09:39:44 +0530
Message-ID: <1343102984-6056-1-git-send-email-prakash.pm@ti.com>
X-Mailer: git-send-email 1.7.1
MIME-Version: 1.0
CC: <davinci-linux-open-source@linux.davincidsp.com>, Florian Tobias
	Schandinat <FlorianSchandinat@gmx.de>
X-BeenThere: davinci-linux-open-source@linux.davincidsp.com
X-Mailman-Version: 2.1.12
Precedence: list
List-Id: <davinci-linux-open-source.linux.davincidsp.com>
List-Unsubscribe: 
 <http://linux.davincidsp.com/mailman/options/davinci-linux-open-source>,
	<mailto:davinci-linux-open-source-request@linux.davincidsp.com?subject=unsubscribe>
List-Archive: 
 <http://linux.davincidsp.com/pipermail/davinci-linux-open-source>
List-Post: <mailto:davinci-linux-open-source@linux.davincidsp.com>
List-Help: 
 <mailto:davinci-linux-open-source-request@linux.davincidsp.com?subject=help>
List-Subscribe: 
 <http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source>,
	<mailto:davinci-linux-open-source-request@linux.davincidsp.com?subject=subscribe>
Sender: 
 <davinci-linux-open-source-bounces+patchwork-davinci=patchwork.kernel.org@linux.davincidsp.com>
Errors-To: 
 davinci-linux-open-source-bounces+patchwork-davinci=patchwork.kernel.org@linux.davincidsp.com

Wait for active frame transfer to complete after disabling LCDC.
At the same this wait is not be required when there are sync and
underflow errors.
More information on disable and reset sequence can be found in
section 13.4.6 of AM335x TRM @www.ti.com/am335x.

Signed-off-by: Manjunathappa, Prakash <prakash.pm@ti.com>
---
Patch applies on top of below patch under review:
http://marc.info/?l=linux-fbdev&m=134280060828708&w=2
"video: da8xx-fb: do clock reset of revision 2 LCDC before enabling"
Since v1:
Changed the commit message, also added link to hardware specification.

 drivers/video/da8xx-fb.c |   48 ++++++++++++++++++++++++++++++++++++---------
 1 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
index a908dfd..0fb4d7d 100644
--- a/drivers/video/da8xx-fb.c
+++ b/drivers/video/da8xx-fb.c
@@ -31,6 +31,7 @@
 #include <linux/cpufreq.h>
 #include <linux/console.h>
 #include <linux/slab.h>
+#include <linux/delay.h>
 #include <video/da8xx-fb.h>
 #include <asm/div64.h>
 
@@ -45,6 +46,7 @@
 #define LCD_PL_LOAD_DONE		BIT(6)
 #define LCD_FIFO_UNDERFLOW		BIT(5)
 #define LCD_SYNC_LOST			BIT(2)
+#define LCD_FRAME_DONE			BIT(0)
 
 /* LCD DMA Control Register */
 #define LCD_DMA_BURST_SIZE(x)		((x) << 4)
@@ -279,13 +281,39 @@ static inline void lcd_enable_raster(void)
 }
 
 /* Disable the Raster Engine of the LCD Controller */
-static inline void lcd_disable_raster(void)
+static inline void lcd_disable_raster(bool wait_for_frame_done)
 {
 	u32 reg;
+	u32 loop_cnt = 0;
+	u32 stat;
+	u32 i = 0;
+
+	/* 50 milli seconds should be sufficient for a frame to complete */
+	if (wait_for_frame_done)
+		loop_cnt = 50;
 
 	reg = lcdc_read(LCD_RASTER_CTRL_REG);
 	if (reg & LCD_RASTER_ENABLE)
 		lcdc_write(reg & ~LCD_RASTER_ENABLE, LCD_RASTER_CTRL_REG);
+
+	/* Wait for the current frame to complete */
+	do {
+		if (lcd_revision == LCD_VERSION_1)
+			stat = lcdc_read(LCD_STAT_REG);
+		else
+			stat = lcdc_read(LCD_RAW_STAT_REG);
+		mdelay(1);
+	} while (!(stat & LCD_FRAME_DONE) && (i++ < loop_cnt));
+
+	if (lcd_revision == LCD_VERSION_1)
+		lcdc_write(stat, LCD_STAT_REG);
+	else
+		lcdc_write(stat, LCD_MASKED_STAT_REG);
+
+	if ((loop_cnt != 0) && (i >= loop_cnt)) {
+		pr_err("LCD Controller timed out\n");
+		return;
+	}
 }
 
 static void lcd_blit(int load_mode, struct da8xx_fb_par *par)
@@ -626,7 +654,7 @@ static int fb_setcolreg(unsigned regno, unsigned red, unsigned green,
 static void lcd_reset(struct da8xx_fb_par *par)
 {
 	/* Disable the Raster if previously Enabled */
-	lcd_disable_raster();
+	lcd_disable_raster(false);
 
 	/* DMA has to be disabled */
 	lcdc_write(0, LCD_DMA_CTRL_REG);
@@ -724,7 +752,7 @@ static irqreturn_t lcdc_irq_handler_rev02(int irq, void *arg)
 
 	if ((stat & LCD_SYNC_LOST) && (stat & LCD_FIFO_UNDERFLOW)) {
 		pr_err("LCDC sync lost or underflow error occurred\n");
-		lcd_disable_raster();
+		lcd_disable_raster(false);
 		lcdc_write(stat, LCD_MASKED_STAT_REG);
 		lcd_enable_raster();
 	} else if (stat & LCD_PL_LOAD_DONE) {
@@ -734,7 +762,7 @@ static irqreturn_t lcdc_irq_handler_rev02(int irq, void *arg)
 		 * interrupt via the following write to the status register. If
 		 * this is done after then one gets multiple PL done interrupts.
 		 */
-		lcd_disable_raster();
+		lcd_disable_raster(false);
 
 		lcdc_write(stat, LCD_MASKED_STAT_REG);
 
@@ -780,7 +808,7 @@ static irqreturn_t lcdc_irq_handler_rev01(int irq, void *arg)
 
 	if ((stat & LCD_SYNC_LOST) && (stat & LCD_FIFO_UNDERFLOW)) {
 		pr_err("LCDC sync lost or underflow error occurred\n");
-		lcd_disable_raster();
+		lcd_disable_raster(false);
 		lcdc_write(stat, LCD_STAT_REG);
 		lcd_enable_raster();
 	} else if (stat & LCD_PL_LOAD_DONE) {
@@ -790,7 +818,7 @@ static irqreturn_t lcdc_irq_handler_rev01(int irq, void *arg)
 		 * interrupt via the following write to the status register. If
 		 * this is done after then one gets multiple PL done interrupts.
 		 */
-		lcd_disable_raster();
+		lcd_disable_raster(false);
 
 		lcdc_write(stat, LCD_STAT_REG);
 
@@ -887,7 +915,7 @@ static int lcd_da8xx_cpufreq_transition(struct notifier_block *nb,
 	if (val == CPUFREQ_POSTCHANGE) {
 		if (par->lcd_fck_rate != clk_get_rate(par->lcdc_clk)) {
 			par->lcd_fck_rate = clk_get_rate(par->lcdc_clk);
-			lcd_disable_raster();
+			lcd_disable_raster(true);
 			lcd_calc_clk_divider(par);
 			lcd_enable_raster();
 		}
@@ -924,7 +952,7 @@ static int __devexit fb_remove(struct platform_device *dev)
 		if (par->panel_power_ctrl)
 			par->panel_power_ctrl(0);
 
-		lcd_disable_raster();
+		lcd_disable_raster(true);
 		lcdc_write(0, LCD_RASTER_CTRL_REG);
 
 		/* disable DMA  */
@@ -1037,7 +1065,7 @@ static int cfb_blank(int blank, struct fb_info *info)
 		if (par->panel_power_ctrl)
 			par->panel_power_ctrl(0);
 
-		lcd_disable_raster();
+		lcd_disable_raster(true);
 		break;
 	default:
 		ret = -EINVAL;
@@ -1377,7 +1405,7 @@ static int fb_suspend(struct platform_device *dev, pm_message_t state)
 		par->panel_power_ctrl(0);
 
 	fb_set_suspend(info, 1);
-	lcd_disable_raster();
+	lcd_disable_raster(true);
 	clk_disable(par->lcdc_clk);
 	console_unlock();