aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-3.10/0164-video-relax-the-dimensions-check-for-rotated-display.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2014-09-27 19:10:51 +0000
committerFlorian Fainelli <florian@openwrt.org>2014-09-27 19:10:51 +0000
commit6918ea2484861cbf806c812b95a814ab40063c05 (patch)
tree3f4d53baabebad9339cadd1bbfaaf07ed61b9c1e /target/linux/brcm2708/patches-3.10/0164-video-relax-the-dimensions-check-for-rotated-display.patch
parentff6b0d57b8e4dd9c72b13ac0586c523c8d6e8841 (diff)
downloadupstream-6918ea2484861cbf806c812b95a814ab40063c05.tar.gz
upstream-6918ea2484861cbf806c812b95a814ab40063c05.tar.bz2
upstream-6918ea2484861cbf806c812b95a814ab40063c05.zip
brcm2708: update 3.10 patches with raspberrypi/rpi-3.10.y of 27 Apr. 2014
Update the 3.10 rasperry patches by rebasing raspberry/rpi-3.10-y against linux-stable/v3.10.49. Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 42678
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.patch13
1 files changed, 9 insertions, 4 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
index bb731187be..d8ac1d93a6 100644
--- 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
@@ -1,16 +1,18 @@
-From cadc956e10cf0811927600dfe1f4657d92aad32a Mon Sep 17 00:00:00 2001
+From c53c5708dcae81fbda536e38bbca6fa45886ffa9 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
+Subject: [PATCH 164/196] video: relax the dimensions check for rotated
displays
---
drivers/video/bcm2708_fb.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
+diff --git a/drivers/video/bcm2708_fb.c b/drivers/video/bcm2708_fb.c
+index 5758146..935288d 100644
--- a/drivers/video/bcm2708_fb.c
+++ b/drivers/video/bcm2708_fb.c
-@@ -255,8 +255,8 @@ static int bcm2708_fb_check_var(struct f
+@@ -255,8 +255,8 @@ static int bcm2708_fb_check_var(struct fb_var_screeninfo *var,
else if (var->vmode & FB_VMODE_INTERLACED)
yres = (yres + 1) / 2;
@@ -21,7 +23,7 @@ Subject: [PATCH 164/174] video: relax the dimensions check for rotated
"special treatment required! (TODO)\n");
return -EINVAL;
}
-@@ -415,7 +415,7 @@ static void bcm2708_fb_copyarea(struct f
+@@ -415,7 +415,7 @@ static void bcm2708_fb_copyarea(struct fb_info *info,
/* Fallback to cfb_copyarea() if we don't like something */
if (bytes_per_pixel > 4 ||
@@ -30,3 +32,6 @@ Subject: [PATCH 164/174] video: relax the dimensions check for rotated
region->width <= 0 || region->width > info->var.xres ||
region->height <= 0 || region->height > info->var.yres ||
region->sx < 0 || region->sx >= info->var.xres ||
+--
+1.9.1
+