diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-02-13 11:38:08 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-02-14 16:45:01 +0100 |
| commit | 9a1d7ff187300767f77401302b43733ee01080b4 (patch) | |
| tree | 7ea9dd08a1b436b0567f64d72e149ea0a960b0a7 /target/linux/brcm2708/patches-4.14/950-0056-fbdev-add-FBIOCOPYAREA-ioctl.patch | |
| parent | a23a13dec27109bbd7171921ec9a89154aabbf26 (diff) | |
| download | upstream-9a1d7ff187300767f77401302b43733ee01080b4.tar.gz upstream-9a1d7ff187300767f77401302b43733ee01080b4.tar.bz2 upstream-9a1d7ff187300767f77401302b43733ee01080b4.zip | |
kernel: bump 4.14 to 4.14.99
Refreshed all patches.
Remove upstreamed:
- 950-0434-mmc-bcm2835-Recover-from-MMC_SEND_EXT_CSD.patch
Compile-tested on: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.14/950-0056-fbdev-add-FBIOCOPYAREA-ioctl.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.14/950-0056-fbdev-add-FBIOCOPYAREA-ioctl.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0056-fbdev-add-FBIOCOPYAREA-ioctl.patch b/target/linux/brcm2708/patches-4.14/950-0056-fbdev-add-FBIOCOPYAREA-ioctl.patch index b01c2203e1..dd41f5d44e 100644 --- a/target/linux/brcm2708/patches-4.14/950-0056-fbdev-add-FBIOCOPYAREA-ioctl.patch +++ b/target/linux/brcm2708/patches-4.14/950-0056-fbdev-add-FBIOCOPYAREA-ioctl.patch @@ -170,7 +170,7 @@ bcm2708_fb: Add ioctl for reading gpu memory through dma platform_set_drvdata(dev, fb); --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c -@@ -1086,6 +1086,31 @@ fb_blank(struct fb_info *info, int blank +@@ -1090,6 +1090,31 @@ fb_blank(struct fb_info *info, int blank } EXPORT_SYMBOL(fb_blank); @@ -202,7 +202,7 @@ bcm2708_fb: Add ioctl for reading gpu memory through dma static long do_fb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) { -@@ -1096,6 +1121,7 @@ static long do_fb_ioctl(struct fb_info * +@@ -1100,6 +1125,7 @@ static long do_fb_ioctl(struct fb_info * struct fb_cmap cmap_from; struct fb_cmap_user cmap; struct fb_event event; @@ -210,7 +210,7 @@ bcm2708_fb: Add ioctl for reading gpu memory through dma void __user *argp = (void __user *)arg; long ret = 0; -@@ -1213,6 +1239,15 @@ static long do_fb_ioctl(struct fb_info * +@@ -1217,6 +1243,15 @@ static long do_fb_ioctl(struct fb_info * unlock_fb_info(info); console_unlock(); break; @@ -226,7 +226,7 @@ bcm2708_fb: Add ioctl for reading gpu memory through dma default: if (!lock_fb_info(info)) return -ENODEV; -@@ -1358,6 +1393,7 @@ static long fb_compat_ioctl(struct file +@@ -1362,6 +1397,7 @@ static long fb_compat_ioctl(struct file case FBIOPAN_DISPLAY: case FBIOGET_CON2FBMAP: case FBIOPUT_CON2FBMAP: |