summaryrefslogtreecommitdiffstats
path: root/drivers/video/fbdev
diff options
context:
space:
mode:
authorAndrea Merello <andrea.merello@gmail.com>2016-01-26 15:48:04 +0100
committerTomi Valkeinen <tomi.valkeinen@ti.com>2016-01-29 12:34:07 +0100
commit87df1b2a2103b9019433da99be43a472c16647ab (patch)
treeb11b6409551b9da6f4ad901a615284742fd79c04 /drivers/video/fbdev
parentARM: omap2plus_defconfig: update display configs (diff)
downloadlinux-87df1b2a2103b9019433da99be43a472c16647ab.tar.xz
linux-87df1b2a2103b9019433da99be43a472c16647ab.zip
ocfb: fix tgdel and tvdel timing parameters
According to the ocfb documentation: Fix tgdel HW param should be left margin, not right. Fix tvdel HW param should upper margin, not lower. This seems to fix lock issues on certain monitors (tested on a slightly customized IP, but the FPGA guy said that it should be the same wrt this changes). Signed-off-by: Andrea Merello <andrea.merello@gmail.com> Acked-by: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/fbdev')
-rw-r--r--drivers/video/fbdev/ocfb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbdev/ocfb.c b/drivers/video/fbdev/ocfb.c
index c9293aea8ec3..a970edc2a6f8 100644
--- a/drivers/video/fbdev/ocfb.c
+++ b/drivers/video/fbdev/ocfb.c
@@ -123,11 +123,11 @@ static int ocfb_setupfb(struct ocfb_dev *fbdev)
/* Horizontal timings */
ocfb_writereg(fbdev, OCFB_HTIM, (var->hsync_len - 1) << 24 |
- (var->right_margin - 1) << 16 | (var->xres - 1));
+ (var->left_margin - 1) << 16 | (var->xres - 1));
/* Vertical timings */
ocfb_writereg(fbdev, OCFB_VTIM, (var->vsync_len - 1) << 24 |
- (var->lower_margin - 1) << 16 | (var->yres - 1));
+ (var->upper_margin - 1) << 16 | (var->yres - 1));
/* Total length of frame */
hlen = var->left_margin + var->right_margin + var->hsync_len +