From 722ae534643f8de17c4ef490bcd4d60098fa07ff Mon Sep 17 00:00:00 2001 From: Markus Niebel Date: Mon, 27 May 2013 10:19:11 +0200 Subject: [PATCH] staging: drm/imx: revert vsync_cnt for di->id 1 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 Tested-by: Philipp Zabel Tested-by: Rogerio Pimentel Signed-off-by: Greg Kroah-Hartman --- 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 e7b9c9819ae9..0b6806e2069c 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) -- 2.20.1