brcm2708: update 3.10 patches with raspberrypi/rpi-3.10.y of 27 Apr. 2014
[openwrt/staging/lynxis/omap.git] / target / linux / brcm2708 / patches-3.10 / 0164-video-relax-the-dimensions-check-for-rotated-display.patch
1 From c53c5708dcae81fbda536e38bbca6fa45886ffa9 Mon Sep 17 00:00:00 2001
2 From: popcornmix <popcornmix@gmail.com>
3 Date: Wed, 29 Jan 2014 21:37:00 +0000
4 Subject: [PATCH 164/196] video: relax the dimensions check for rotated
5 displays
6
7 ---
8 drivers/video/bcm2708_fb.c | 6 +++---
9 1 file changed, 3 insertions(+), 3 deletions(-)
10
11 diff --git a/drivers/video/bcm2708_fb.c b/drivers/video/bcm2708_fb.c
12 index 5758146..935288d 100644
13 --- a/drivers/video/bcm2708_fb.c
14 +++ b/drivers/video/bcm2708_fb.c
15 @@ -255,8 +255,8 @@ static int bcm2708_fb_check_var(struct fb_var_screeninfo *var,
16 else if (var->vmode & FB_VMODE_INTERLACED)
17 yres = (yres + 1) / 2;
18
19 - if (yres > 1200) {
20 - pr_err("bcm2708_fb_check_var: ERROR: VerticalTotal >= 1200; "
21 + if (var->xres * yres > 1920 * 1200) {
22 + pr_err("bcm2708_fb_check_var: ERROR: Pixel size >= 1920x1200; "
23 "special treatment required! (TODO)\n");
24 return -EINVAL;
25 }
26 @@ -415,7 +415,7 @@ static void bcm2708_fb_copyarea(struct fb_info *info,
27
28 /* Fallback to cfb_copyarea() if we don't like something */
29 if (bytes_per_pixel > 4 ||
30 - info->var.xres > 1920 || info->var.yres > 1200 ||
31 + info->var.xres * info->var.yres > 1920 * 1200 ||
32 region->width <= 0 || region->width > info->var.xres ||
33 region->height <= 0 || region->height > info->var.yres ||
34 region->sx < 0 || region->sx >= info->var.xres ||
35 --
36 1.9.1
37