From patchwork Thu Feb 11 10:23:50 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Phil Edworthy <Phil.Edworthy@renesas.com>
X-Patchwork-Id: 78675
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1BAOZdv017496
	for <patchwork-sh@patchwork.kernel.org>; Thu, 11 Feb 2010 10:24:35 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751832Ab0BKKYQ (ORCPT
	<rfc822;patchwork-sh@patchwork.kernel.org>);
	Thu, 11 Feb 2010 05:24:16 -0500
Received: from mail.renesas.com ([202.234.163.13]:62121 "EHLO
	mail04.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org
	with ESMTP id S1751791Ab0BKKYK convert rfc822-to-8bit (ORCPT
	<rfc822;linux-sh@vger.kernel.org>); Thu, 11 Feb 2010 05:24:10 -0500
X-AuditID: ac140387-0000000400000202-04-4b73dac81a8c
Received: from guardian03.idc.renesas.com ([172.20.8.202])
	by mail04.idc.renesas.com (sendmail) with ESMTP id o1BAO8Fv008002;
	Thu, 11 Feb 2010 19:24:08 +0900 (JST)
Received: (from root@localhost)
	by guardian03.idc.renesas.com with  id o1BAO8tK024810;
	Thu, 11 Feb 2010 19:24:08 +0900 (JST)
Received: from mta01.idc.renesas.com (localhost [127.0.0.1])
	by mta01.idc.renesas.com with ESMTP id o1BAO7S9010514;
	Thu, 11 Feb 2010 19:24:07 +0900 (JST)
Received: from rte-ben-exch.RTE.ADWIN.RENESAS.COM ([172.28.0.16]) by
	rte-idc-bh1.RTE.ADWIN.RENESAS.COM with Microsoft
	SMTPSVC(6.0.3790.211); Thu, 11 Feb 2010 10:24:00 +0000
X-MimeOLE: Produced By Microsoft Exchange V6.5
Content-class: urn:content-classes:message
MIME-Version: 1.0
Subject: [PATCH 01/02] sh: Add wait for vsync
Date: Thu, 11 Feb 2010 10:23:50 -0000
Message-ID: 
 <AB12B32E73474741A2C5361C433A44DE0178367F@rte-ben-exch.RTE.ADWIN.RENESAS.COM>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: [PATCH 01/02] sh: Add wait for vsync
thread-index: AcqqmFH25A46qZOcSg+MKTO96oG0nwAabOyAAACMjtA=
From: "Phil Edworthy" <Phil.Edworthy@renesas.com>
To: <linux-sh@vger.kernel.org>
Cc: <linux-fbdev@vger.kernel.org>,
	"Guennadi Liakhovetski" <g.liakhovetski@gmx.de>
X-OriginalArrivalTime: 11 Feb 2010 10:24:00.0409 (UTC)
	FILETIME=[5396C890:01CAAB04]
X-Brightmail-Tracker: AAAAAA==
Sender: linux-sh-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-sh.vger.kernel.org>
X-Mailing-List: linux-sh@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Thu, 11 Feb 2010 10:24:35 +0000 (UTC)


--- a/drivers/video/sh_mobile_lcdcfb.c
+++ b/drivers/video/sh_mobile_lcdcfb.c
@@ -19,6 +19,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/interrupt.h>
 #include <linux/vmalloc.h>
+#include <linux/ioctl.h>
 #include <video/sh_mobile_lcdc.h>
 #include <asm/atomic.h>
 
@@ -40,6 +41,10 @@
 #define _LDDWAR 0x900
 #define _LDDRAR 0x904
 
+#ifndef FBIO_WAITFORVSYNC
+#define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32)
+#endif
+
 /* shared registers and their order for context save/restore */
 static int lcdc_shared_regs[] = {
 	_LDDCKR,
@@ -106,6 +111,7 @@ static unsigned long lcdc_offs_sublcd[NR
 #define LDRCNTR_SRC	0x00010000
 #define LDRCNTR_MRS	0x00000002
 #define LDRCNTR_MRC	0x00000001
+#define LDSR_MRS	0x00000100
 
 struct sh_mobile_lcdc_priv;
 struct sh_mobile_lcdc_chan {
@@ -124,6 +130,7 @@ struct sh_mobile_lcdc_chan {
 	unsigned long pan_offset;
 	unsigned long new_pan_offset;
 	wait_queue_head_t frame_end_wait;
+	struct completion vsync_completion;
 };
 
 struct sh_mobile_lcdc_priv {
@@ -366,7 +373,8 @@ static irqreturn_t sh_mobile_lcdc_irq(in
 		}
 
 		/* VSYNC End */
-		if (ldintr & LDINTR_VES) {
+		if ((ldintr & LDINTR_VES) &&
+		    (ch->pan_offset != ch->new_pan_offset)) {
 			unsigned long ldrcntr = lcdc_read(priv, _LDRCNTR);
 			/* Set the source address for the next refresh */
 			lcdc_write_chan_mirror(ch, LDSA1R, ch->dma_handle +
@@ -379,6 +387,9 @@ static irqreturn_t sh_mobile_lcdc_irq(in
 					   ldrcntr ^ LDRCNTR_MRS);
 			ch->pan_offset = ch->new_pan_offset;
 		}
+
+		if (ldintr & LDINTR_VES)
+			complete(&ch->vsync_completion);
 	}
 
 	return IRQ_HANDLED;
@@ -786,6 +797,44 @@ static int sh_mobile_fb_pan_display(stru
 	return 0;
 }
 
+static int sh_mobile_wait_for_vsync(struct fb_info *info)
+{
+	struct sh_mobile_lcdc_chan *ch = info->par;
+	unsigned long ldintr;
+	int ret;
+
+	/* Enable VSync End interrupt */
+	ldintr = lcdc_read(ch->lcdc, _LDINTR);
+	ldintr |= LDINTR_VEE;
+	lcdc_write(ch->lcdc, _LDINTR, ldintr);
+
+	ret =
wait_for_completion_interruptible_timeout(&ch->vsync_completion,
+
msecs_to_jiffies(100));
+
+	if (!ret)
+		return -ETIMEDOUT;
+
+	return 0;
+}
+
+static int sh_mobile_ioctl(struct fb_info *info, unsigned int cmd,
+		       unsigned long arg)
+{
+	int retval;
+
+	switch (cmd) {
+	case FBIO_WAITFORVSYNC:
+		retval = sh_mobile_wait_for_vsync(info);
+		break;
+
+	default:
+		retval = -ENOIOCTLCMD;
+		break;
+	}
+	return retval;
+}
+
+
 static struct fb_ops sh_mobile_lcdc_ops = {