diff options
| author | Florian Fainelli <florian@openwrt.org> | 2014-02-28 20:30:08 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2014-02-28 20:30:08 +0000 |
| commit | bb39b8d99aae1f7eb13a97bd874838da91080de6 (patch) | |
| tree | 3046f53937c0bc5dc13e2b2ab7b688a1932199bf /target/linux/brcm2708/patches-3.10/0164-video-relax-the-dimensions-check-for-rotated-display.patch | |
| parent | c6c0d09f85c211560a1405441925681cfa25e8b1 (diff) | |
| download | upstream-bb39b8d99aae1f7eb13a97bd874838da91080de6.tar.gz upstream-bb39b8d99aae1f7eb13a97bd874838da91080de6.tar.bz2 upstream-bb39b8d99aae1f7eb13a97bd874838da91080de6.zip | |
brcm2708: update against latest rpi-3.10.y branch
Update our copies of the brcm2708 patches to the latest rpi-3.10-y
rebased against linux-3.10.y stable (3.10.32). This should hopefully
make it easier for us in the future to leverage the raspberry/rpi-*
branches.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 39770
Diffstat (limited to 'target/linux/brcm2708/patches-3.10/0164-video-relax-the-dimensions-check-for-rotated-display.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-3.10/0164-video-relax-the-dimensions-check-for-rotated-display.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-3.10/0164-video-relax-the-dimensions-check-for-rotated-display.patch b/target/linux/brcm2708/patches-3.10/0164-video-relax-the-dimensions-check-for-rotated-display.patch new file mode 100644 index 0000000000..bb731187be --- /dev/null +++ b/target/linux/brcm2708/patches-3.10/0164-video-relax-the-dimensions-check-for-rotated-display.patch @@ -0,0 +1,32 @@ +From cadc956e10cf0811927600dfe1f4657d92aad32a Mon Sep 17 00:00:00 2001 +From: popcornmix <popcornmix@gmail.com> +Date: Wed, 29 Jan 2014 21:37:00 +0000 +Subject: [PATCH 164/174] video: relax the dimensions check for rotated + displays + +--- + drivers/video/bcm2708_fb.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/drivers/video/bcm2708_fb.c ++++ b/drivers/video/bcm2708_fb.c +@@ -255,8 +255,8 @@ static int bcm2708_fb_check_var(struct f + else if (var->vmode & FB_VMODE_INTERLACED) + yres = (yres + 1) / 2; + +- if (yres > 1200) { +- pr_err("bcm2708_fb_check_var: ERROR: VerticalTotal >= 1200; " ++ if (var->xres * yres > 1920 * 1200) { ++ pr_err("bcm2708_fb_check_var: ERROR: Pixel size >= 1920x1200; " + "special treatment required! (TODO)\n"); + return -EINVAL; + } +@@ -415,7 +415,7 @@ static void bcm2708_fb_copyarea(struct f + + /* Fallback to cfb_copyarea() if we don't like something */ + if (bytes_per_pixel > 4 || +- info->var.xres > 1920 || info->var.yres > 1200 || ++ info->var.xres * info->var.yres > 1920 * 1200 || + region->width <= 0 || region->width > info->var.xres || + region->height <= 0 || region->height > info->var.yres || + region->sx < 0 || region->sx >= info->var.xres || |