Skip to content

Commit

Permalink
video: imxfb: Fix the maximum value for yres
Browse files Browse the repository at this point in the history
MX27 and MX25 have 10 bits in the YMAX field of LCDC Size Register.

Fix the maximum value for yres.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Fabio Estevam authored and Paul Mundt committed Jan 6, 2011
1 parent 417d482 commit 7ee04fd
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions drivers/video/imxfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,8 @@
#define LCDC_SIZE 0x04
#define SIZE_XMAX(x) ((((x) >> 4) & 0x3f) << 20)

#ifdef CONFIG_ARCH_MX1
#define SIZE_YMAX(y) ((y) & 0x1ff)
#else
#define SIZE_YMAX(y) ((y) & 0x3ff)
#endif
#define YMAX_MASK (cpu_is_mx1() ? 0x1ff : 0x3ff)
#define SIZE_YMAX(y) ((y) & YMAX_MASK)

#define LCDC_VPW 0x08
#define VPW_VPW(x) ((x) & 0x3ff)
Expand Down Expand Up @@ -623,7 +620,7 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *inf
if (var->right_margin > 255)
printk(KERN_ERR "%s: invalid right_margin %d\n",
info->fix.id, var->right_margin);
if (var->yres < 1 || var->yres > 511)
if (var->yres < 1 || var->yres > YMAX_MASK)
printk(KERN_ERR "%s: invalid yres %d\n",
info->fix.id, var->yres);
if (var->vsync_len > 100)
Expand Down

0 comments on commit 7ee04fd

Please sign in to comment.