kernel: bump 4.14 to 4.14.111

[openwrt/openwrt.git] / target / linux / brcm2708 / patches-4.14 / 950-0056-fbdev-add-FBIOCOPYAREA-ioctl.patch

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 dd41f5d44e32e7435c2c5d64243599e96c9225ae..242fa50d9c52610fb198a64e1d6c920594b3b2bb 100644 (file)
--- 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
-@@ -1090,6 +1090,31 @@ fb_blank(struct fb_info *info, int blank
+@@ -1093,6 +1093,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)
  {
-@@ -1100,6 +1125,7 @@ static long do_fb_ioctl(struct fb_info *
+@@ -1103,6 +1128,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;
  
-@@ -1217,6 +1243,15 @@ static long do_fb_ioctl(struct fb_info *
+@@ -1220,6 +1246,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;
-@@ -1362,6 +1397,7 @@ static long fb_compat_ioctl(struct file
+@@ -1365,6 +1400,7 @@ static long fb_compat_ioctl(struct file
        case FBIOPAN_DISPLAY:
        case FBIOGET_CON2FBMAP:
        case FBIOPUT_CON2FBMAP: