diff options
| author | John Audia <therealgraysky@proton.me> | 2022-07-21 16:12:42 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-07-31 18:55:22 +0200 |
| commit | 4921ab0be462aa0336e3a100e0bf77ffbcc6c09a (patch) | |
| tree | a3db322bd3fb5d72e9b96a6a33d4be81fb5a459b /target/linux/bcm27xx/patches-5.15/950-0067-fbdev-add-FBIOCOPYAREA-ioctl.patch | |
| parent | ce014b1e3903887d47bede8128f2c698418ac5f1 (diff) | |
| download | upstream-4921ab0be462aa0336e3a100e0bf77ffbcc6c09a.tar.gz upstream-4921ab0be462aa0336e3a100e0bf77ffbcc6c09a.tar.bz2 upstream-4921ab0be462aa0336e3a100e0bf77ffbcc6c09a.zip | |
kernel: bump 5.15 to 5.15.56
Manually rebased:
bcm27xx/patches-5.15/950-0470-sound-usb-add-device-quirks-for-A4Tech-FHD-1080p-web.patch
Remove upstreamed:
bcm27xx/patches-5.15/950-0060-tty-amba-pl011-Add-un-throttle-support.patch[1]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.56&id=2db3b95166f72e6481a79b82b1d6f94f4b18fcc1
Build system: x86_64
Build-tested: bcm2711/RPi4B, mt7622/RT3200
Run-tested: bcm2711/RPi4B, mt7622/RT3200
Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.15/950-0067-fbdev-add-FBIOCOPYAREA-ioctl.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.15/950-0067-fbdev-add-FBIOCOPYAREA-ioctl.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/bcm27xx/patches-5.15/950-0067-fbdev-add-FBIOCOPYAREA-ioctl.patch b/target/linux/bcm27xx/patches-5.15/950-0067-fbdev-add-FBIOCOPYAREA-ioctl.patch index 2b2a5f50ff..b2286f8f80 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0067-fbdev-add-FBIOCOPYAREA-ioctl.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0067-fbdev-add-FBIOCOPYAREA-ioctl.patch @@ -244,7 +244,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> static int bcm2708_fb_register(struct bcm2708_fb *fb) --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c -@@ -1096,6 +1096,30 @@ fb_blank(struct fb_info *info, int blank +@@ -1097,6 +1097,30 @@ fb_blank(struct fb_info *info, int blank } EXPORT_SYMBOL(fb_blank); @@ -275,7 +275,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> static long do_fb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) { -@@ -1104,6 +1128,7 @@ static long do_fb_ioctl(struct fb_info * +@@ -1105,6 +1129,7 @@ static long do_fb_ioctl(struct fb_info * struct fb_fix_screeninfo fix; struct fb_cmap cmap_from; struct fb_cmap_user cmap; @@ -283,7 +283,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> void __user *argp = (void __user *)arg; long ret = 0; -@@ -1181,6 +1206,15 @@ static long do_fb_ioctl(struct fb_info * +@@ -1182,6 +1207,15 @@ static long do_fb_ioctl(struct fb_info * unlock_fb_info(info); console_unlock(); break; @@ -299,7 +299,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> default: lock_fb_info(info); fb = info->fbops; -@@ -1320,6 +1354,7 @@ static long fb_compat_ioctl(struct file +@@ -1321,6 +1355,7 @@ static long fb_compat_ioctl(struct file case FBIOPAN_DISPLAY: case FBIOGET_CON2FBMAP: case FBIOPUT_CON2FBMAP: |