diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2010-12-24 10:28:24 -0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-12-27 23:05:55 +0900 |
| commit | 60328917e6019c7f8a2e70c08d433a05ba9fcfb7 (patch) | |
| tree | 19d571cfdf784f620379f7e981f9328a26c908d2 /drivers | |
| parent | acd0acb65ec907a9e872bbaa7ad811a518b49b45 (diff) | |
| download | linux-3.10-60328917e6019c7f8a2e70c08d433a05ba9fcfb7.tar.gz linux-3.10-60328917e6019c7f8a2e70c08d433a05ba9fcfb7.tar.bz2 linux-3.10-60328917e6019c7f8a2e70c08d433a05ba9fcfb7.zip | |
video: imxfb: Fix the maximum value for yres
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/imxfb.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c index 5c363d026f6..1ab2c258867 100644 --- a/drivers/video/imxfb.c +++ b/drivers/video/imxfb.c @@ -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) @@ -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) |