return n < 0 ? d >> -n : d << n;
}
-static void fb_set_logocmap(struct fb_info *info,
+static void __init fb_set_logocmap(struct fb_info *info,
const struct linux_logo *logo)
{
struct fb_cmap palette_cmap;
palette_cmap.blue[j] = clut[2] << 8 | clut[2];
clut += 3;
}
- fb_set_cmap(&palette_cmap, info);
+ fb_set_cmap(&palette_cmap, 1, info);
}
}
-static void fb_set_logo_truepalette(struct fb_info *info,
+static void __init fb_set_logo_truepalette(struct fb_info *info,
const struct linux_logo *logo,
u32 *palette)
{
}
}
-static void fb_set_logo_directpalette(struct fb_info *info,
+static void __init fb_set_logo_directpalette(struct fb_info *info,
const struct linux_logo *logo,
u32 *palette)
{
palette[i] = i << redshift | i << greenshift | i << blueshift;
}
-static void fb_set_logo(struct fb_info *info,
+static void __init fb_set_logo(struct fb_info *info,
const struct linux_logo *logo, u8 *dst,
int depth)
{
}
int
-fb_cursor(struct fb_info *info, struct fb_cursor_user __user *sprite)
+fb_cursor(struct fb_info *info, struct fb_cursor *sprite)
{
- struct fb_cursor_user cursor_user;
struct fb_cursor cursor;
- char *data = NULL, *mask = NULL;
- u16 *red = NULL, *green = NULL, *blue = NULL, *transp = NULL;
- int err = -EINVAL;
+ int err;
- if (copy_from_user(&cursor_user, sprite, sizeof(struct fb_cursor_user)))
+ if (copy_from_user(&cursor, sprite, sizeof(struct fb_cursor)))
return -EFAULT;
- memcpy(&cursor, &cursor_user, sizeof(cursor));
- cursor.mask = NULL;
- cursor.image.data = NULL;
- cursor.image.cmap.red = NULL;
- cursor.image.cmap.green = NULL;
- cursor.image.cmap.blue = NULL;
- cursor.image.cmap.transp = NULL;
-
if (cursor.set & FB_CUR_SETCUR)
info->cursor.enable = 1;
if (cursor.set & FB_CUR_SETCMAP) {
- unsigned len = cursor.image.cmap.len;
- if ((int)len <= 0)
- goto out;
- len *= 2;
- err = -ENOMEM;
- red = kmalloc(len, GFP_USER);
- green = kmalloc(len, GFP_USER);
- blue = kmalloc(len, GFP_USER);
- if (!red || !green || !blue)
- goto out;
- if (cursor_user.image.cmap.transp) {
- transp = kmalloc(len, GFP_USER);
- if (!transp)
- goto out;
- }
- err = -EFAULT;
- if (copy_from_user(red, cursor_user.image.cmap.red, len))
- goto out;
- if (copy_from_user(green, cursor_user.image.cmap.green, len))
- goto out;
- if (copy_from_user(blue, cursor_user.image.cmap.blue, len))
- goto out;
- if (transp) {
- if (copy_from_user(transp,
- cursor_user.image.cmap.transp, len))
- goto out;
- }
- cursor.image.cmap.red = red;
- cursor.image.cmap.green = green;
- cursor.image.cmap.blue = blue;
- cursor.image.cmap.transp = transp;
+ err = fb_copy_cmap(&cursor.image.cmap, &sprite->image.cmap, 1);
+ if (err)
+ return err;
}
if (cursor.set & FB_CUR_SETSHAPE) {
int size = ((cursor.image.width + 7) >> 3) * cursor.image.height;
+ char *data, *mask;
if ((cursor.image.height != info->cursor.image.height) ||
(cursor.image.width != info->cursor.image.width))
cursor.set |= FB_CUR_SETSIZE;
- err = -ENOMEM;
- data = kmalloc(size, GFP_USER);
- mask = kmalloc(size, GFP_USER);
- if (!mask || !data)
- goto out;
+ data = kmalloc(size, GFP_KERNEL);
+ if (!data)
+ return -ENOMEM;
- err = -EFAULT;
- if (copy_from_user(data, cursor_user.image.data, size) ||
- copy_from_user(mask, cursor_user.mask, size))
- goto out;
+ mask = kmalloc(size, GFP_KERNEL);
+ if (!mask) {
+ kfree(data);
+ return -ENOMEM;
+ }
+ if (copy_from_user(data, sprite->image.data, size) ||
+ copy_from_user(mask, sprite->mask, size)) {
+ kfree(data);
+ kfree(mask);
+ return -EFAULT;
+ }
cursor.image.data = data;
cursor.mask = mask;
}
info->cursor.set = cursor.set;
info->cursor.rop = cursor.rop;
err = info->fbops->fb_cursor(info, &cursor);
-out:
- kfree(data);
- kfree(mask);
- kfree(red);
- kfree(green);
- kfree(blue);
- kfree(transp);
return err;
}
fb_pan_display(info, &info->var);
- fb_set_cmap(&info->cmap, info);
+ fb_set_cmap(&info->cmap, 1, info);
if (info->flags & FBINFO_MISC_MODECHANGEUSER) {
info->flags &= ~FBINFO_MISC_MODECHANGEUSER;
cmap.len = info->cmap.len;
} else
cmap = info->cmap;
- return fb_set_cmap(&cmap, info);
+ return fb_set_cmap(&cmap, 1, info);
}
static int
#ifdef CONFIG_FRAMEBUFFER_CONSOLE
struct fb_con2fbmap con2fb;
#endif
- struct fb_cmap_user cmap;
- void __user *argp = (void __user *)arg;
+ struct fb_cmap cmap;
int i;
if (!fb)
return -ENODEV;
switch (cmd) {
case FBIOGET_VSCREENINFO:
- return copy_to_user(argp, &info->var,
+ return copy_to_user((void *) arg, &info->var,
sizeof(var)) ? -EFAULT : 0;
case FBIOPUT_VSCREENINFO:
- if (copy_from_user(&var, argp, sizeof(var)))
+ if (copy_from_user(&var, (void *) arg, sizeof(var)))
return -EFAULT;
acquire_console_sem();
info->flags |= FBINFO_MISC_MODECHANGEUSER;
info->flags &= ~FBINFO_MISC_MODECHANGEUSER;
release_console_sem();
if (i) return i;
- if (copy_to_user(argp, &var, sizeof(var)))
+ if (copy_to_user((void *) arg, &var, sizeof(var)))
return -EFAULT;
return 0;
case FBIOGET_FSCREENINFO:
- return copy_to_user(argp, &info->fix,
+ return copy_to_user((void *) arg, &info->fix,
sizeof(fix)) ? -EFAULT : 0;
case FBIOPUTCMAP:
- if (copy_from_user(&cmap, argp, sizeof(cmap)))
+ if (copy_from_user(&cmap, (void *) arg, sizeof(cmap)))
return -EFAULT;
- return (fb_set_user_cmap(&cmap, info));
+ return (fb_set_cmap(&cmap, 0, info));
case FBIOGETCMAP:
- if (copy_from_user(&cmap, argp, sizeof(cmap)))
+ if (copy_from_user(&cmap, (void *) arg, sizeof(cmap)))
return -EFAULT;
- return fb_cmap_to_user(&info->cmap, &cmap);
+ return (fb_copy_cmap(&info->cmap, &cmap, 2));
case FBIOPAN_DISPLAY:
- if (copy_from_user(&var, argp, sizeof(var)))
+ if (copy_from_user(&var, (void *) arg, sizeof(var)))
return -EFAULT;
acquire_console_sem();
i = fb_pan_display(info, &var);
release_console_sem();
if (i)
return i;
- if (copy_to_user(argp, &var, sizeof(var)))
+ if (copy_to_user((void *) arg, &var, sizeof(var)))
return -EFAULT;
return 0;
case FBIO_CURSOR:
acquire_console_sem();
- i = fb_cursor(info, argp);
+ i = fb_cursor(info, (struct fb_cursor *) arg);
release_console_sem();
return i;
#ifdef CONFIG_FRAMEBUFFER_CONSOLE
case FBIOGET_CON2FBMAP:
- if (copy_from_user(&con2fb, argp, sizeof(con2fb)))
+ if (copy_from_user(&con2fb, (void *)arg, sizeof(con2fb)))
return -EFAULT;
if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
return -EINVAL;
con2fb.framebuffer = con2fb_map[con2fb.console-1];
- return copy_to_user(argp, &con2fb,
+ return copy_to_user((void *)arg, &con2fb,
sizeof(con2fb)) ? -EFAULT : 0;
case FBIOPUT_CON2FBMAP:
- if (copy_from_user(&con2fb, argp, sizeof(con2fb)))
+ if (copy_from_user(&con2fb, (void *)arg, sizeof(con2fb)))
return - EFAULT;
if (con2fb.console < 0 || con2fb.console > MAX_NR_CONSOLES)
return -EINVAL;