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 <Markus.Niebel@tqs.de>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
Tested-by: Philipp Zabel <p.zabel@pengutronix.de>
Tested-by: Rogerio Pimentel <rpimentel.silva@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/imx-drm/ipu-v3/ipu-di.c b/drivers/staging/imx-drm/ipu-v3/ipu-di.c
index e7b9c9819ae9cacd18ca4a07ee3835848f7e0eaa..0b6806e2069c3705afe13da8315871c407757ffb 100644 (file)
--- 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)