diff options
| author | Markus Niebel <Markus.Niebel@tqs.de> | 2013-05-27 12:19:11 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-30 16:02:07 +0400 |
| commit | 722ae534643f8de17c4ef490bcd4d60098fa07ff (patch) | |
| tree | 77129f25355fc36714d95d97a02e22be1bfdeb82 /drivers/staging/imx-drm | |
| parent | 18689f12bf684098370b37a87a4830abab54220f (diff) | |
| download | linux-722ae534643f8de17c4ef490bcd4d60098fa07ff.tar.xz | |
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>
Diffstat (limited to 'drivers/staging/imx-drm')
| -rw-r--r-- | drivers/staging/imx-drm/ipu-v3/ipu-di.c | 7 |
1 files changed, 6 insertions, 1 deletions
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) |