From patchwork Thu Jun 12 17:06:30 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Philipp Zabel
X-Patchwork-Id: 4343791
Return-Path:
X-Original-To: patchwork-linux-media@patchwork.kernel.org
Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org
Received: from mail.kernel.org (mail.kernel.org [198.145.19.201])
by patchwork1.web.kernel.org (Postfix) with ESMTP id 2726A9F3B4
for ;
Thu, 12 Jun 2014 17:06:55 +0000 (UTC)
Received: from mail.kernel.org (localhost [127.0.0.1])
by mail.kernel.org (Postfix) with ESMTP id 3E48E2034A
for ;
Thu, 12 Jun 2014 17:06:53 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
by mail.kernel.org (Postfix) with ESMTP id 718FA20340
for ;
Thu, 12 Jun 2014 17:06:52 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S1756283AbaFLRGt (ORCPT
);
Thu, 12 Jun 2014 13:06:49 -0400
Received: from metis.ext.pengutronix.de ([92.198.50.35]:33029 "EHLO
metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S1756203AbaFLRGp (ORCPT
);
Thu, 12 Jun 2014 13:06:45 -0400
Received: from dude.hi.pengutronix.de ([10.1.0.7] helo=dude.pengutronix.de)
by metis.ext.pengutronix.de with esmtp (Exim 4.72)
(envelope-from )
id 1Wv8SZ-0000jm-UE; Thu, 12 Jun 2014 19:06:43 +0200
From: Philipp Zabel
To: linux-media@vger.kernel.org
Cc: Steve Longerbeam ,
Philipp Zabel
Subject: [RFC PATCH 16/26] [media] ipuv3-csi: Skip 3 lines for NTSC BT.656
Date: Thu, 12 Jun 2014 19:06:30 +0200
Message-Id: <1402592800-2925-17-git-send-email-p.zabel@pengutronix.de>
X-Mailer: git-send-email 2.0.0.rc2
In-Reply-To: <1402592800-2925-1-git-send-email-p.zabel@pengutronix.de>
References: <1402592800-2925-1-git-send-email-p.zabel@pengutronix.de>
X-SA-Exim-Connect-IP: 10.1.0.7
X-SA-Exim-Mail-From: p.zabel@pengutronix.de
X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de);
SAEximRunCond expanded to false
X-PTX-Original-Recipient: linux-media@vger.kernel.org
Sender: linux-media-owner@vger.kernel.org
Precedence: bulk
List-ID:
X-Mailing-List: linux-media@vger.kernel.org
X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI,
RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org
X-Virus-Scanned: ClamAV using ClamSMTP
TVP5150 creates 480 visible lines, but synchronisation
signals for 486 visible lines.
Signed-off-by: Philipp Zabel
---
drivers/media/platform/imx/imx-ipuv3-csi.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/imx/imx-ipuv3-csi.c b/drivers/media/platform/imx/imx-ipuv3-csi.c
index d9326a8..dfa2daa 100644
--- a/drivers/media/platform/imx/imx-ipuv3-csi.c
+++ b/drivers/media/platform/imx/imx-ipuv3-csi.c
@@ -698,8 +698,14 @@ static int ipucsi_videobuf_start_streaming(struct vb2_queue *vq, unsigned int co
ipu_csi_write(ipucsi, CSI_ACT_FRM_HEIGHT(yres) | CSI_ACT_FRM_WIDTH(xres),
CSI_ACT_FRM_SIZE);
- ipu_csi_write(ipucsi, CSI_OUT_FRM_CTRL_HSC(0) | CSI_OUT_FRM_CTRL_VSC(0),
- CSI_OUT_FRM_CTRL);
+ /* FIXME */
+ if (xres == 720 && yres == 480) {
+ ipu_csi_write(ipucsi, CSI_OUT_FRM_CTRL_HSC(0) |
+ CSI_OUT_FRM_CTRL_VSC(3), CSI_OUT_FRM_CTRL);
+ } else {
+ ipu_csi_write(ipucsi, CSI_OUT_FRM_CTRL_HSC(0) |
+ CSI_OUT_FRM_CTRL_VSC(0), CSI_OUT_FRM_CTRL);
+ }
ret = media_entity_pipeline_start(&ipucsi->subdev.entity, &ipucsi->pipe);
if (ret)