Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git] / drivers / video / fbsysfs.c
index 4fec33d..34e0739 100644 (file)
@@ -17,6 +17,7 @@
 
 #include <linux/kernel.h>
 #include <linux/fb.h>
+#include <linux/console.h>
 
 /**
  * framebuffer_alloc - creates a new frame buffer info structure
@@ -42,10 +43,11 @@ struct fb_info *framebuffer_alloc(size_t size, struct device *dev)
        if (size)
                fb_info_size += PADDING;
 
-       p = kmalloc(fb_info_size + size, GFP_KERNEL);
+       p = kzalloc(fb_info_size + size, GFP_KERNEL);
+
        if (!p)
                return NULL;
-       memset(p, 0, fb_info_size + size);
+
        info = (struct fb_info *) p;
 
        if (size)
@@ -57,6 +59,7 @@ struct fb_info *framebuffer_alloc(size_t size, struct device *dev)
 #undef PADDING
 #undef BYTES_PER_LONG
 }
+EXPORT_SYMBOL(framebuffer_alloc);
 
 /**
  * framebuffer_release - marks the structure available for freeing
@@ -71,6 +74,384 @@ void framebuffer_release(struct fb_info *info)
 {
        kfree(info);
 }
-
 EXPORT_SYMBOL(framebuffer_release);
-EXPORT_SYMBOL(framebuffer_alloc);
+
+static int activate(struct fb_info *fb_info, struct fb_var_screeninfo *var)
+{
+       int err;
+
+       var->activate |= FB_ACTIVATE_FORCE;
+       acquire_console_sem();
+       fb_info->flags |= FBINFO_MISC_USEREVENT;
+       err = fb_set_var(fb_info, var);
+       fb_info->flags &= ~FBINFO_MISC_USEREVENT;
+       release_console_sem();
+       if (err)
+               return err;
+       return 0;
+}
+
+static int mode_string(char *buf, unsigned int offset,
+                      const struct fb_videomode *mode)
+{
+       char m = 'U';
+       if (mode->flag & FB_MODE_IS_DETAILED)
+               m = 'D';
+       if (mode->flag & FB_MODE_IS_VESA)
+               m = 'V';
+       if (mode->flag & FB_MODE_IS_STANDARD)
+               m = 'S';
+       return snprintf(&buf[offset], PAGE_SIZE - offset, "%c:%dx%d-%d\n", m, mode->xres, mode->yres, mode->refresh);
+}
+
+static ssize_t store_mode(struct class_device *class_device, const char * buf,
+                         size_t count)
+{
+       struct fb_info *fb_info = class_get_devdata(class_device);
+       char mstr[100];
+       struct fb_var_screeninfo var;
+       struct fb_modelist *modelist;
+       struct fb_videomode *mode;
+       struct list_head *pos;
+       size_t i;
+       int err;
+
+       memset(&var, 0, sizeof(var));
+
+       list_for_each(pos, &fb_info->modelist) {
+               modelist = list_entry(pos, struct fb_modelist, list);
+               mode = &modelist->mode;
+               i = mode_string(mstr, 0, mode);
+               if (strncmp(mstr, buf, max(count, i)) == 0) {
+
+                       var = fb_info->var;
+                       fb_videomode_to_var(&var, mode);
+                       if ((err = activate(fb_info, &var)))
+                               return err;
+                       fb_info->mode = mode;
+                       return count;
+               }
+       }
+       return -EINVAL;
+}
+
+static ssize_t show_mode(struct class_device *class_device, char *buf)
+{
+       struct fb_info *fb_info = class_get_devdata(class_device);
+
+       if (!fb_info->mode)
+               return 0;
+
+       return mode_string(buf, 0, fb_info->mode);
+}
+
+static ssize_t store_modes(struct class_device *class_device, const char * buf,
+                          size_t count)
+{
+       struct fb_info *fb_info = class_get_devdata(class_device);
+       LIST_HEAD(old_list);
+       int i = count / sizeof(struct fb_videomode);
+
+       if (i * sizeof(struct fb_videomode) != count)
+               return -EINVAL;
+
+       acquire_console_sem();
+       list_splice(&fb_info->modelist, &old_list);
+       fb_videomode_to_modelist((struct fb_videomode *)buf, i,
+                                &fb_info->modelist);
+       if (fb_new_modelist(fb_info)) {
+               fb_destroy_modelist(&fb_info->modelist);
+               list_splice(&old_list, &fb_info->modelist);
+       } else
+               fb_destroy_modelist(&old_list);
+
+       release_console_sem();
+
+       return 0;
+}
+
+static ssize_t show_modes(struct class_device *class_device, char *buf)
+{
+       struct fb_info *fb_info = class_get_devdata(class_device);
+       unsigned int i;
+       struct list_head *pos;
+       struct fb_modelist *modelist;
+       const struct fb_videomode *mode;
+
+       i = 0;
+       list_for_each(pos, &fb_info->modelist) {
+               modelist = list_entry(pos, struct fb_modelist, list);
+               mode = &modelist->mode;
+               i += mode_string(buf, i, mode);
+       }
+       return i;
+}
+
+static ssize_t store_bpp(struct class_device *class_device, const char * buf,
+                        size_t count)
+{
+       struct fb_info *fb_info = class_get_devdata(class_device);
+       struct fb_var_screeninfo var;
+       char ** last = NULL;
+       int err;
+
+       var = fb_info->var;
+       var.bits_per_pixel = simple_strtoul(buf, last, 0);
+       if ((err = activate(fb_info, &var)))
+               return err;
+       return count;
+}
+
+static ssize_t show_bpp(struct class_device *class_device, char *buf)
+{
+       struct fb_info *fb_info = class_get_devdata(class_device);
+       return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->var.bits_per_pixel);
+}
+
+static ssize_t store_rotate(struct class_device *class_device, const char *buf,
+                           size_t count)
+{
+       struct fb_info *fb_info = class_get_devdata(class_device);
+       struct fb_var_screeninfo var;
+       char **last = NULL;
+       int err;
+
+       var = fb_info->var;
+       var.rotate = simple_strtoul(buf, last, 0);
+
+       if ((err = activate(fb_info, &var)))
+               return err;
+
+       return count;
+}
+
+
+static ssize_t show_rotate(struct class_device *class_device, char *buf)
+{
+       struct fb_info *fb_info = class_get_devdata(class_device);
+
+       return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->var.rotate);
+}
+
+static ssize_t store_con_rotate(struct class_device *class_device,
+                               const char *buf, size_t count)
+{
+       struct fb_info *fb_info = class_get_devdata(class_device);
+       int rotate;
+       char **last = NULL;
+
+       acquire_console_sem();
+       rotate = simple_strtoul(buf, last, 0);
+       fb_con_duit(fb_info, FB_EVENT_SET_CON_ROTATE, &rotate);
+       release_console_sem();
+       return count;
+}
+
+static ssize_t store_con_rotate_all(struct class_device *class_device,
+                               const char *buf, size_t count)
+{
+       struct fb_info *fb_info = class_get_devdata(class_device);
+       int rotate;
+       char **last = NULL;
+
+       acquire_console_sem();
+       rotate = simple_strtoul(buf, last, 0);
+       fb_con_duit(fb_info, FB_EVENT_SET_CON_ROTATE_ALL, &rotate);
+       release_console_sem();
+       return count;
+}
+
+static ssize_t show_con_rotate(struct class_device *class_device, char *buf)
+{
+       struct fb_info *fb_info = class_get_devdata(class_device);
+       int rotate;
+
+       acquire_console_sem();
+       rotate = fb_con_duit(fb_info, FB_EVENT_GET_CON_ROTATE, NULL);
+       release_console_sem();
+       return snprintf(buf, PAGE_SIZE, "%d\n", rotate);
+}
+
+static ssize_t store_virtual(struct class_device *class_device,
+                            const char * buf, size_t count)
+{
+       struct fb_info *fb_info = class_get_devdata(class_device);
+       struct fb_var_screeninfo var;
+       char *last = NULL;
+       int err;
+
+       var = fb_info->var;
+       var.xres_virtual = simple_strtoul(buf, &last, 0);
+       last++;
+       if (last - buf >= count)
+               return -EINVAL;
+       var.yres_virtual = simple_strtoul(last, &last, 0);
+
+       if ((err = activate(fb_info, &var)))
+               return err;
+       return count;
+}
+
+static ssize_t show_virtual(struct class_device *class_device, char *buf)
+{
+       struct fb_info *fb_info = class_get_devdata(class_device);
+       return snprintf(buf, PAGE_SIZE, "%d,%d\n", fb_info->var.xres_virtual,
+                       fb_info->var.yres_virtual);
+}
+
+static ssize_t show_stride(struct class_device *class_device, char *buf)
+{
+       struct fb_info *fb_info = class_get_devdata(class_device);
+       return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->fix.line_length);
+}
+
+static ssize_t store_blank(struct class_device *class_device, const char * buf,
+                          size_t count)
+{
+       struct fb_info *fb_info = class_get_devdata(class_device);
+       char *last = NULL;
+       int err;
+
+       acquire_console_sem();
+       fb_info->flags |= FBINFO_MISC_USEREVENT;
+       err = fb_blank(fb_info, simple_strtoul(buf, &last, 0));
+       fb_info->flags &= ~FBINFO_MISC_USEREVENT;
+       release_console_sem();
+       if (err < 0)
+               return err;
+       return count;
+}
+
+static ssize_t show_blank(struct class_device *class_device, char *buf)
+{
+//     struct fb_info *fb_info = class_get_devdata(class_device);
+       return 0;
+}
+
+static ssize_t store_console(struct class_device *class_device,
+                            const char * buf, size_t count)
+{
+//     struct fb_info *fb_info = class_get_devdata(class_device);
+       return 0;
+}
+
+static ssize_t show_console(struct class_device *class_device, char *buf)
+{
+//     struct fb_info *fb_info = class_get_devdata(class_device);
+       return 0;
+}
+
+static ssize_t store_cursor(struct class_device *class_device,
+                           const char * buf, size_t count)
+{
+//     struct fb_info *fb_info = class_get_devdata(class_device);
+       return 0;
+}
+
+static ssize_t show_cursor(struct class_device *class_device, char *buf)
+{
+//     struct fb_info *fb_info = class_get_devdata(class_device);
+       return 0;
+}
+
+static ssize_t store_pan(struct class_device *class_device, const char * buf,
+                        size_t count)
+{
+       struct fb_info *fb_info = class_get_devdata(class_device);
+       struct fb_var_screeninfo var;
+       char *last = NULL;
+       int err;
+
+       var = fb_info->var;
+       var.xoffset = simple_strtoul(buf, &last, 0);
+       last++;
+       if (last - buf >= count)
+               return -EINVAL;
+       var.yoffset = simple_strtoul(last, &last, 0);
+
+       acquire_console_sem();
+       err = fb_pan_display(fb_info, &var);
+       release_console_sem();
+
+       if (err < 0)
+               return err;
+       return count;
+}
+
+static ssize_t show_pan(struct class_device *class_device, char *buf)
+{
+       struct fb_info *fb_info = class_get_devdata(class_device);
+       return snprintf(buf, PAGE_SIZE, "%d,%d\n", fb_info->var.xoffset,
+                       fb_info->var.xoffset);
+}
+
+static ssize_t show_name(struct class_device *class_device, char *buf)
+{
+       struct fb_info *fb_info = class_get_devdata(class_device);
+
+       return snprintf(buf, PAGE_SIZE, "%s\n", fb_info->fix.id);
+}
+
+static ssize_t store_fbstate(struct class_device *class_device,
+                       const char *buf, size_t count)
+{
+       struct fb_info *fb_info = class_get_devdata(class_device);
+       u32 state;
+       char *last = NULL;
+
+       state = simple_strtoul(buf, &last, 0);
+
+       acquire_console_sem();
+       fb_set_suspend(fb_info, (int)state);
+       release_console_sem();
+
+       return count;
+}
+
+static ssize_t show_fbstate(struct class_device *class_device, char *buf)
+{
+       struct fb_info *fb_info = class_get_devdata(class_device);
+       return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->state);
+}
+
+/* When cmap is added back in it should be a binary attribute
+ * not a text one. Consideration should also be given to converting
+ * fbdev to use configfs instead of sysfs */
+static struct class_device_attribute class_device_attrs[] = {
+       __ATTR(bits_per_pixel, S_IRUGO|S_IWUSR, show_bpp, store_bpp),
+       __ATTR(blank, S_IRUGO|S_IWUSR, show_blank, store_blank),
+       __ATTR(console, S_IRUGO|S_IWUSR, show_console, store_console),
+       __ATTR(cursor, S_IRUGO|S_IWUSR, show_cursor, store_cursor),
+       __ATTR(mode, S_IRUGO|S_IWUSR, show_mode, store_mode),
+       __ATTR(modes, S_IRUGO|S_IWUSR, show_modes, store_modes),
+       __ATTR(pan, S_IRUGO|S_IWUSR, show_pan, store_pan),
+       __ATTR(virtual_size, S_IRUGO|S_IWUSR, show_virtual, store_virtual),
+       __ATTR(name, S_IRUGO, show_name, NULL),
+       __ATTR(stride, S_IRUGO, show_stride, NULL),
+       __ATTR(rotate, S_IRUGO|S_IWUSR, show_rotate, store_rotate),
+       __ATTR(con_rotate, S_IRUGO|S_IWUSR, show_con_rotate, store_con_rotate),
+       __ATTR(con_rotate_all, S_IWUSR, NULL, store_con_rotate_all),
+       __ATTR(state, S_IRUGO|S_IWUSR, show_fbstate, store_fbstate),
+};
+
+int fb_init_class_device(struct fb_info *fb_info)
+{
+       unsigned int i;
+       class_set_devdata(fb_info->class_device, fb_info);
+
+       for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++)
+               class_device_create_file(fb_info->class_device,
+                                        &class_device_attrs[i]);
+       return 0;
+}
+
+void fb_cleanup_class_device(struct fb_info *fb_info)
+{
+       unsigned int i;
+
+       for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++)
+               class_device_remove_file(fb_info->class_device,
+                                        &class_device_attrs[i]);
+}
+
+