summaryrefslogtreecommitdiff
path: root/drivers/video/imxfb.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2009-02-14 16:29:38 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2009-03-13 10:34:24 +0100
commit7e8549bcee00d92040904361cb1840c7a5eda615 (patch)
tree4bd0b3833c212407f4fb71075df8c141f1f257e4 /drivers/video/imxfb.c
parent1d0f98709347c4babac08dd933466674e089f188 (diff)
downloadlinux-3.10-7e8549bcee00d92040904361cb1840c7a5eda615.tar.gz
linux-3.10-7e8549bcee00d92040904361cb1840c7a5eda615.tar.bz2
linux-3.10-7e8549bcee00d92040904361cb1840c7a5eda615.zip
imxfb: Fix margin settings
The var->hsync_len, var->right_margin and var->left_margin fields should contain the real values, not the hardware dependent values. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/video/imxfb.c')
-rw-r--r--drivers/video/imxfb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
index 9dd27576db7..bd1cb75cd14 100644
--- a/drivers/video/imxfb.c
+++ b/drivers/video/imxfb.c
@@ -495,9 +495,9 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *inf
info->fix.id, var->lower_margin);
#endif
- writel(HCR_H_WIDTH(var->hsync_len) |
- HCR_H_WAIT_1(var->right_margin) |
- HCR_H_WAIT_2(var->left_margin),
+ writel(HCR_H_WIDTH(var->hsync_len - 1) |
+ HCR_H_WAIT_1(var->right_margin - 1) |
+ HCR_H_WAIT_2(var->left_margin - 3),
fbi->regs + LCDC_HCR);
writel(VCR_V_WIDTH(var->vsync_len) |