[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20090713152004.GC1297@lilem.mirepesht>
Date: Mon, 13 Jul 2009 19:50:04 +0430
From: Ali Gholami Rudi <ali@...i.ir>
To: fbdev <linux-fbdev-devel@...ts.sourceforge.net>
Cc: Andrew Morton <akpm@...ux-foundation.org>,
Andrea Righi <righi.andrea@...il.com>,
Krzysztof Helt <krzysztof.h1@...pl>,
Greg Kroah-Hartman <gregkh@...e.de>,
Geert Uytterhoeven <Geert.Uytterhoeven@...ycom.com>,
Philippe De Muyter <phdm@...qel.be>,
linux-kernel@...r.kernel.org
Subject: [PATCH 2/2] fbdev: add FBIOCOPYAREA ioctl
Signed-off-by: Ali Gholami Rudi <ali@...i.ir>
---
drivers/video/fbmem.c | 25 +++++++++++++++++++++++++
include/linux/fb.h | 1 +
2 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index a90cd0f..518119a 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1035,6 +1035,25 @@ out:
return ret;
}
+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)
{
@@ -1046,6 +1065,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
struct fb_cmap_user cmap;
struct fb_event event;
struct fb_fillrect fill;
+ struct fb_copyarea copy;
void __user *argp = (void __user *)arg;
long ret = 0;
@@ -1158,6 +1178,11 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
return -EFAULT;
ret = fb_fillrect_user(info, &fill);
break;
+ case FBIOCOPYAREA:
+ if (copy_from_user(©, argp, sizeof(copy)))
+ return -EFAULT;
+ ret = fb_copyarea_user(info, ©);
+ break;
default:
if (!lock_fb_info(info))
return -ENODEV;
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 40cc99a..f1cf8df 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -38,6 +38,7 @@ struct dentry;
#define FBIOPUT_MODEINFO 0x4617
#define FBIOGET_DISPINFO 0x4618
#define FBIOFILLRECT 0x4619
+#define FBIOCOPYAREA 0x461A
#define FB_TYPE_PACKED_PIXELS 0 /* Packed Pixels */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists