From patchwork Wed Feb 10 15:00:14 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: 78437
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 o1AF0N3I032204
	for <patchwork-sh@patchwork.kernel.org>; Wed, 10 Feb 2010 15:00:24 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754695Ab0BJPAW (ORCPT
	<rfc822;patchwork-sh@patchwork.kernel.org>);
	Wed, 10 Feb 2010 10:00:22 -0500
Received: from mail.renesas.com ([202.234.163.13]:46084 "EHLO
	mail02.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org
	with ESMTP id S1754556Ab0BJPAV convert rfc822-to-8bit (ORCPT
	<rfc822;linux-sh@vger.kernel.org>); Wed, 10 Feb 2010 10:00:21 -0500
X-AuditID: ac140385-0000000a000002de-56-4b72ca005538
Received: from guardian02.idc.renesas.com ([172.20.8.201])
	by mail02.idc.renesas.com (sendmail) with ESMTP id o1AF0GJY001885;
	Thu, 11 Feb 2010 00:00:16 +0900 (JST)
Received: (from root@localhost)
	by guardian02.idc.renesas.com with  id o1AF0Gkc006760;
	Thu, 11 Feb 2010 00:00:16 +0900 (JST)
Received: from mta02.idc.renesas.com (localhost [127.0.0.1])
	by mta02.idc.renesas.com with ESMTP id o1AF0Hfh005422;
	Thu, 11 Feb 2010 00:00:17 +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); Wed, 10 Feb 2010 15:00:12 +0000
X-MimeOLE: Produced By Microsoft Exchange V6.5
Content-class: urn:content-classes:message
MIME-Version: 1.0
Subject: [PATCH] sh: Add wait for vsync ioctl
Date: Wed, 10 Feb 2010 15:00:14 -0000
Message-ID: 
 <AB12B32E73474741A2C5361C433A44DE017832D3@rte-ben-exch.RTE.ADWIN.RENESAS.COM>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: [PATCH] sh: Add wait for vsync ioctl
thread-index: AcqqYcAZweSlDWTNTAuS6Uzv3rrg0A==
From: "Phil Edworthy" <Phil.Edworthy@renesas.com>
To: <linux-sh@vger.kernel.org>
Cc: <linux-fbdev@vger.kernel.org>, "Guennadi" <g.liakhovetski@gmx.de>
X-OriginalArrivalTime: 10 Feb 2010 15:00:12.0834 (UTC)
	FILETIME=[BF1C6820:01CAAA61]
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]);
	Wed, 10 Feb 2010 15:00:24 +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 @@
 #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,8 @@
 	unsigned long pan_offset;
 	unsigned long new_pan_offset;
 	wait_queue_head_t frame_end_wait;
+	unsigned long seen_vsync;
+	wait_queue_head_t wait_vsync;
 };
 
 struct sh_mobile_lcdc_priv {
@@ -367,17 +375,22 @@
 
 		/* VSYNC End */
 		if (ldintr & LDINTR_VES) {
-			unsigned long ldrcntr = lcdc_read(priv, _LDRCNTR);
-			/* Set the source address for the next refresh */
-			lcdc_write_chan_mirror(ch, LDSA1R, ch->dma_handle +
-					       ch->new_pan_offset);
-			if (lcdc_chan_is_sublcd(ch))
-				lcdc_write(ch->lcdc, _LDRCNTR,
-					   ldrcntr ^ LDRCNTR_SRS);
-			else
-				lcdc_write(ch->lcdc, _LDRCNTR,
-					   ldrcntr ^ LDRCNTR_MRS);
-			ch->pan_offset = ch->new_pan_offset;
+			if (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 +
+
ch->new_pan_offset);
+				if (lcdc_chan_is_sublcd(ch))
+					lcdc_write(ch->lcdc, _LDRCNTR,
+						   ldrcntr ^ LDRCNTR_SRS);
+				else
+					lcdc_write(ch->lcdc, _LDRCNTR,
+						   ldrcntr ^ LDRCNTR_MRS);
+				ch->pan_offset = ch->new_pan_offset;
+			}
+
+			ch->seen_vsync = 1;