raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

fbdev: add FBIOCOPYAREA ioctl

Browse Source 
Based on the patch authored by Ali Gholami Rudi at
    https://lkml.org/lkml/2009/7/13/153

Provide an ioctl for userspace applications, but only if this operation
is hardware accelerated (otherwide it does not make any sense).

Signed-off-by: Siarhei Siamashka <siarhei.siamashka@gmail.com>
This commit is contained in:
Siarhei Siamashka
2013-06-17 13:32:11 +03:00
committed by popcornmix
parent 671a207f4c
commit aaf755a09f
2 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/video/fbdev/core/fbmem.c
View File

@@ -1084,6 +1084,25 @@ fb_blank(struct fb_info *info, int blank)
}
EXPORT_SYMBOL(fb_blank);
static int fb_copyarea_user(struct fb_info *info,
struct fb_copyarea *copy)
{
int ret = 0;
if (!lock_fb_info(info))
return -ENODEV;
if (copy->dx + copy->width > info->var.xres ||
copy->sx + copy->width > info->var.xres ||
copy->dy + copy->height > info->var.yres ||
copy->sy + copy->height > info->var.yres) {
ret = -EINVAL;
goto out;
}
info->fbops->fb_copyarea(info, copy);
out:
unlock_fb_info(info);
return ret;
}
static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
unsigned long arg)
{
@@ -1094,6 +1113,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
struct fb_cmap cmap_from;
struct fb_cmap_user cmap;
struct fb_event event;
struct fb_copyarea copy;
void __user *argp = (void __user *)arg;
long ret = 0;
@@ -1211,6 +1231,15 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
unlock_fb_info(info);
console_unlock();
break;
case FBIOCOPYAREA:
if (info->flags & FBINFO_HWACCEL_COPYAREA) {
/* only provide this ioctl if it is accelerated */
if (copy_from_user(&copy, argp, sizeof(copy)))
return -EFAULT;
ret = fb_copyarea_user(info, &copy);
break;
}
/* fall through */
default:
if (!lock_fb_info(info))
return -ENODEV;
@@ -1365,6 +1394,7 @@ static long fb_compat_ioctl(struct file *file, unsigned int cmd,
case FBIOPAN_DISPLAY:
case FBIOGET_CON2FBMAP:
case FBIOPUT_CON2FBMAP:
case FBIOCOPYAREA:
arg = (unsigned long) compat_ptr(arg);
case FBIOBLANK:
ret = do_fb_ioctl(info, cmd, arg);

5
include/uapi/linux/fb.h
View File

@@ -34,6 +34,11 @@
#define FBIOPUT_MODEINFO 0x4617
#define FBIOGET_DISPINFO 0x4618
#define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32)
/*
* HACK: use 'z' in order not to clash with any other ioctl numbers which might
* be concurrently added to the mainline kernel
*/
#define FBIOCOPYAREA _IOW('z', 0x21, struct fb_copyarea)
#define FB_TYPE_PACKED_PIXELS 0 /* Packed Pixels */
#define FB_TYPE_PLANES 1 /* Non interleaved planes */