fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / video / console / softcursor.c

diff --git a/drivers/video/console/softcursor.c b/drivers/video/console/softcursor.c
index 3957fc7..f577bd8 100644 (file)
--- a/drivers/video/console/softcursor.c
+++ b/drivers/video/console/softcursor.c
@@ -1,16 +1,17 @@
 /*
- * linux/drivers/video/softcursor.c -- Generic software cursor for frame buffer devices
+ * linux/drivers/video/softcursor.c
+ *
+ * Generic software cursor for frame buffer devices
  *
  *  Created 14 Nov 2002 by James Simmons
  *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file COPYING in the main directory of this archive
- * for more details.
+ * This file is subject to the terms and conditions of the GNU General
+ * Public License.  See the file COPYING in the main directory of this
+ * archive for more details.
  */
 
 #include <linux/module.h>
 #include <linux/string.h>
-#include <linux/tty.h>
 #include <linux/fb.h>
 #include <linux/slab.h>
 
@@ -21,11 +22,12 @@
 
 int soft_cursor(struct fb_info *info, struct fb_cursor *cursor)
 {
+       struct fbcon_ops *ops = info->fbcon_par;
        unsigned int scan_align = info->pixmap.scan_align - 1;
        unsigned int buf_align = info->pixmap.buf_align - 1;
        unsigned int i, size, dsize, s_pitch, d_pitch;
        struct fb_image *image;
-       u8 *dst, *src;
+       u8 *src, *dst;
 
        if (info->state != FBINFO_STATE_RUNNING)
                return 0;
@@ -33,11 +35,20 @@ int soft_cursor(struct fb_info *info, struct fb_cursor *cursor)
        s_pitch = (cursor->image.width + 7) >> 3;
        dsize = s_pitch * cursor->image.height;
 
-       src = kmalloc(dsize + sizeof(struct fb_image), GFP_ATOMIC);
-       if (!src)
-               return -ENOMEM;
+       if (dsize + sizeof(struct fb_image) != ops->cursor_size) {
+               if (ops->cursor_src != NULL)
+                       kfree(ops->cursor_src);
+               ops->cursor_size = dsize + sizeof(struct fb_image);
+
+               ops->cursor_src = kmalloc(ops->cursor_size, GFP_ATOMIC);
+               if (!ops->cursor_src) {
+                       ops->cursor_size = 0;
+                       return -ENOMEM;
+               }
+       }
 
-       image = (struct fb_image *) (src + dsize);
+       src = ops->cursor_src + sizeof(struct fb_image);
+       image = (struct fb_image *)ops->cursor_src;
        *image = cursor->image;
        d_pitch = (s_pitch + scan_align) & ~scan_align;
 
@@ -63,7 +74,6 @@ int soft_cursor(struct fb_info *info, struct fb_cursor *cursor)
        fb_pad_aligned_buffer(dst, d_pitch, src, s_pitch, image->height);
        image->data = dst;
        info->fbops->fb_imageblit(info, image);
-       kfree(src);
        return 0;
 }