diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-10-02 13:38:04 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-10-02 16:11:47 +0200 |
| commit | 93a48cb1a0f8b34fa1a3c60de4f2f5ead7165847 (patch) | |
| tree | 7bfa85f74d4056464b74dfd0354a33b3c0619ad5 /target/linux/brcm2708/patches-4.14/950-0056-fbdev-add-FBIOCOPYAREA-ioctl.patch | |
| parent | 123d12eada9a8d63e790af372f30359415812228 (diff) | |
| download | upstream-93a48cb1a0f8b34fa1a3c60de4f2f5ead7165847.tar.gz upstream-93a48cb1a0f8b34fa1a3c60de4f2f5ead7165847.tar.bz2 upstream-93a48cb1a0f8b34fa1a3c60de4f2f5ead7165847.zip | |
kernel: bump 4.14 to 4.14.248
All updated automatically.
Compile-tested on: lantiq/xrx200, armvirt/64
Runtime-tested on: lantiq/xrx200, armvirt/64
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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 242fa50d9c..881db93810 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 -@@ -1093,6 +1093,31 @@ fb_blank(struct fb_info *info, int blank +@@ -1104,6 +1104,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) { -@@ -1103,6 +1128,7 @@ static long do_fb_ioctl(struct fb_info * +@@ -1114,6 +1139,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; -@@ -1220,6 +1246,15 @@ static long do_fb_ioctl(struct fb_info * +@@ -1231,6 +1257,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; -@@ -1365,6 +1400,7 @@ static long fb_compat_ioctl(struct file +@@ -1376,6 +1411,7 @@ static long fb_compat_ioctl(struct file case FBIOPAN_DISPLAY: case FBIOGET_CON2FBMAP: case FBIOPUT_CON2FBMAP: |