From patchwork Tue May 21 18:04:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Niebel X-Patchwork-Id: 2598501 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id 0C987DFB79 for ; Tue, 21 May 2013 18:01:36 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ueqru-0000dG-8M; Tue, 21 May 2013 18:01:02 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ueqre-0004kw-QG; Tue, 21 May 2013 18:00:46 +0000 Received: from smtprelay01.ispgateway.de ([80.67.31.28]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UeqrP-0004iW-IS for linux-arm-kernel@lists.infradead.org; Tue, 21 May 2013 18:00:32 +0000 Received: from [89.246.71.91] (helo=mail6.tqsc.de) by smtprelay01.ispgateway.de with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.68) (envelope-from ) id 1Ueqr8-0002hf-DR; Tue, 21 May 2013 20:00:14 +0200 Received: from sc1006092vm.tqsc.de ([192.168.80.77] helo=ubuntu.tqsc.de) by mail6.tqsc.de with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1Ueqr8-0006rm-0A; Tue, 21 May 2013 20:00:14 +0200 From: Markus Niebel To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 3/3] staging: drm/imx: revert vsync_cnt for di->id 1 Date: Tue, 21 May 2013 20:04:07 +0200 Message-Id: <1369159448-14584-4-git-send-email-list-09_linux_arm@tqsc.de> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1369159448-14584-1-git-send-email-list-09_linux_arm@tqsc.de> References: <1369159448-14584-1-git-send-email-list-09_linux_arm@tqsc.de> X-Df-Sender: MTQ1NzgzNQ== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130521_140031_769320_D52F132E X-CRM114-Status: GOOD ( 10.86 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [80.67.31.28 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Markus Niebel , shawn.guo@linaro.org, p.zabel@pengutronix.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Markus Niebel partial fix of changes from "staging: drm/imx: Add support for VGA via TVE on i.MX53" parallel display support / DVI needs the original setting to work Signed-off-by: Markus Niebel Acked-by: Philipp Zabel --- V2: - no changes in patch - add Acked-by from v1 of patch drivers/staging/imx-drm/ipu-v3/ipu-di.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/staging/imx-drm/ipu-v3/ipu-di.c b/drivers/staging/imx-drm/ipu-v3/ipu-di.c index e7b9c98..0b6806e 100644 --- a/drivers/staging/imx-drm/ipu-v3/ipu-di.c +++ b/drivers/staging/imx-drm/ipu-v3/ipu-di.c @@ -603,7 +603,12 @@ int ipu_di_init_sync_panel(struct ipu_di *di, struct ipu_di_signal_cfg *sig) vsync_cnt = 3; if (di->id == 1) - vsync_cnt = 6; + /* + * TODO: change only for TVEv2, parallel display + * uses pin 2 / 3 + */ + if (!(sig->hsync_pin == 2 && sig->vsync_pin == 3)) + vsync_cnt = 6; if (sig->Hsync_pol) { if (sig->hsync_pin == 2)