Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[linux-2.6-microblaze.git] / drivers / gpu / drm / drm_fb_helper.c
index fd27f19..61a5d45 100644 (file)
@@ -670,6 +670,28 @@ static void drm_fb_helper_memory_range_to_clip(struct fb_info *info, off_t off,
        drm_rect_init(clip, x1, y1, x2 - x1, y2 - y1);
 }
 
+/* Don't use in new code. */
+void drm_fb_helper_damage_range(struct fb_info *info, off_t off, size_t len)
+{
+       struct drm_fb_helper *fb_helper = info->par;
+       struct drm_rect damage_area;
+
+       drm_fb_helper_memory_range_to_clip(info, off, len, &damage_area);
+       drm_fb_helper_damage(fb_helper, damage_area.x1, damage_area.y1,
+                            drm_rect_width(&damage_area),
+                            drm_rect_height(&damage_area));
+}
+EXPORT_SYMBOL(drm_fb_helper_damage_range);
+
+/* Don't use in new code. */
+void drm_fb_helper_damage_area(struct fb_info *info, u32 x, u32 y, u32 width, u32 height)
+{
+       struct drm_fb_helper *fb_helper = info->par;
+
+       drm_fb_helper_damage(fb_helper, x, y, width, height);
+}
+EXPORT_SYMBOL(drm_fb_helper_damage_area);
+
 /**
  * drm_fb_helper_deferred_io() - fbdev deferred_io callback function
  * @info: fb_info struct pointer
@@ -714,386 +736,6 @@ void drm_fb_helper_deferred_io(struct fb_info *info, struct list_head *pagerefli
 }
 EXPORT_SYMBOL(drm_fb_helper_deferred_io);
 
-typedef ssize_t (*drm_fb_helper_read_screen)(struct fb_info *info, char __user *buf,
-                                            size_t count, loff_t pos);
-
-static ssize_t __drm_fb_helper_read(struct fb_info *info, char __user *buf, size_t count,
-                                   loff_t *ppos, drm_fb_helper_read_screen read_screen)
-{
-       loff_t pos = *ppos;
-       size_t total_size;
-       ssize_t ret;
-
-       if (info->screen_size)
-               total_size = info->screen_size;
-       else
-               total_size = info->fix.smem_len;
-
-       if (pos >= total_size)
-               return 0;
-       if (count >= total_size)
-               count = total_size;
-       if (total_size - count < pos)
-               count = total_size - pos;
-
-       if (info->fbops->fb_sync)
-               info->fbops->fb_sync(info);
-
-       ret = read_screen(info, buf, count, pos);
-       if (ret > 0)
-               *ppos += ret;
-
-       return ret;
-}
-
-typedef ssize_t (*drm_fb_helper_write_screen)(struct fb_info *info, const char __user *buf,
-                                             size_t count, loff_t pos);
-
-static ssize_t __drm_fb_helper_write(struct fb_info *info, const char __user *buf, size_t count,
-                                    loff_t *ppos, drm_fb_helper_write_screen write_screen)
-{
-       loff_t pos = *ppos;
-       size_t total_size;
-       ssize_t ret;
-       int err = 0;
-
-       if (info->screen_size)
-               total_size = info->screen_size;
-       else
-               total_size = info->fix.smem_len;
-
-       if (pos > total_size)
-               return -EFBIG;
-       if (count > total_size) {
-               err = -EFBIG;
-               count = total_size;
-       }
-       if (total_size - count < pos) {
-               if (!err)
-                       err = -ENOSPC;
-               count = total_size - pos;
-       }
-
-       if (info->fbops->fb_sync)
-               info->fbops->fb_sync(info);
-
-       /*
-        * Copy to framebuffer even if we already logged an error. Emulates
-        * the behavior of the original fbdev implementation.
-        */
-       ret = write_screen(info, buf, count, pos);
-       if (ret < 0)
-               return ret; /* return last error, if any */
-       else if (!ret)
-               return err; /* return previous error, if any */
-
-       *ppos += ret;
-
-       return ret;
-}
-
-static ssize_t drm_fb_helper_read_screen_buffer(struct fb_info *info, char __user *buf,
-                                               size_t count, loff_t pos)
-{
-       const char *src = info->screen_buffer + pos;
-
-       if (copy_to_user(buf, src, count))
-               return -EFAULT;
-
-       return count;
-}
-
-/**
- * drm_fb_helper_sys_read - Implements struct &fb_ops.fb_read for system memory
- * @info: fb_info struct pointer
- * @buf: userspace buffer to read from framebuffer memory
- * @count: number of bytes to read from framebuffer memory
- * @ppos: read offset within framebuffer memory
- *
- * Returns:
- * The number of bytes read on success, or an error code otherwise.
- */
-ssize_t drm_fb_helper_sys_read(struct fb_info *info, char __user *buf,
-                              size_t count, loff_t *ppos)
-{
-       return __drm_fb_helper_read(info, buf, count, ppos, drm_fb_helper_read_screen_buffer);
-}
-EXPORT_SYMBOL(drm_fb_helper_sys_read);
-
-static ssize_t drm_fb_helper_write_screen_buffer(struct fb_info *info, const char __user *buf,
-                                                size_t count, loff_t pos)
-{
-       char *dst = info->screen_buffer + pos;
-
-       if (copy_from_user(dst, buf, count))
-               return -EFAULT;
-
-       return count;
-}
-
-/**
- * drm_fb_helper_sys_write - Implements struct &fb_ops.fb_write for system memory
- * @info: fb_info struct pointer
- * @buf: userspace buffer to write to framebuffer memory
- * @count: number of bytes to write to framebuffer memory
- * @ppos: write offset within framebuffer memory
- *
- * Returns:
- * The number of bytes written on success, or an error code otherwise.
- */
-ssize_t drm_fb_helper_sys_write(struct fb_info *info, const char __user *buf,
-                               size_t count, loff_t *ppos)
-{
-       struct drm_fb_helper *helper = info->par;
-       loff_t pos = *ppos;
-       ssize_t ret;
-       struct drm_rect damage_area;
-
-       ret = __drm_fb_helper_write(info, buf, count, ppos, drm_fb_helper_write_screen_buffer);
-       if (ret <= 0)
-               return ret;
-
-       if (helper->funcs->fb_dirty) {
-               drm_fb_helper_memory_range_to_clip(info, pos, ret, &damage_area);
-               drm_fb_helper_damage(helper, damage_area.x1, damage_area.y1,
-                                    drm_rect_width(&damage_area),
-                                    drm_rect_height(&damage_area));
-       }
-
-       return ret;
-}
-EXPORT_SYMBOL(drm_fb_helper_sys_write);
-
-/**
- * drm_fb_helper_sys_fillrect - wrapper around sys_fillrect
- * @info: fbdev registered by the helper
- * @rect: info about rectangle to fill
- *
- * A wrapper around sys_fillrect implemented by fbdev core
- */
-void drm_fb_helper_sys_fillrect(struct fb_info *info,
-                               const struct fb_fillrect *rect)
-{
-       struct drm_fb_helper *helper = info->par;
-
-       sys_fillrect(info, rect);
-
-       if (helper->funcs->fb_dirty)
-               drm_fb_helper_damage(helper, rect->dx, rect->dy, rect->width, rect->height);
-}
-EXPORT_SYMBOL(drm_fb_helper_sys_fillrect);
-
-/**
- * drm_fb_helper_sys_copyarea - wrapper around sys_copyarea
- * @info: fbdev registered by the helper
- * @area: info about area to copy
- *
- * A wrapper around sys_copyarea implemented by fbdev core
- */
-void drm_fb_helper_sys_copyarea(struct fb_info *info,
-                               const struct fb_copyarea *area)
-{
-       struct drm_fb_helper *helper = info->par;
-
-       sys_copyarea(info, area);
-
-       if (helper->funcs->fb_dirty)
-               drm_fb_helper_damage(helper, area->dx, area->dy, area->width, area->height);
-}
-EXPORT_SYMBOL(drm_fb_helper_sys_copyarea);
-
-/**
- * drm_fb_helper_sys_imageblit - wrapper around sys_imageblit
- * @info: fbdev registered by the helper
- * @image: info about image to blit
- *
- * A wrapper around sys_imageblit implemented by fbdev core
- */
-void drm_fb_helper_sys_imageblit(struct fb_info *info,
-                                const struct fb_image *image)
-{
-       struct drm_fb_helper *helper = info->par;
-
-       sys_imageblit(info, image);
-
-       if (helper->funcs->fb_dirty)
-               drm_fb_helper_damage(helper, image->dx, image->dy, image->width, image->height);
-}
-EXPORT_SYMBOL(drm_fb_helper_sys_imageblit);
-
-static ssize_t fb_read_screen_base(struct fb_info *info, char __user *buf, size_t count,
-                                  loff_t pos)
-{
-       const char __iomem *src = info->screen_base + pos;
-       size_t alloc_size = min_t(size_t, count, PAGE_SIZE);
-       ssize_t ret = 0;
-       int err = 0;
-       char *tmp;
-
-       tmp = kmalloc(alloc_size, GFP_KERNEL);
-       if (!tmp)
-               return -ENOMEM;
-
-       while (count) {
-               size_t c = min_t(size_t, count, alloc_size);
-
-               memcpy_fromio(tmp, src, c);
-               if (copy_to_user(buf, tmp, c)) {
-                       err = -EFAULT;
-                       break;
-               }
-
-               src += c;
-               buf += c;
-               ret += c;
-               count -= c;
-       }
-
-       kfree(tmp);
-
-       return ret ? ret : err;
-}
-
-/**
- * drm_fb_helper_cfb_read - Implements struct &fb_ops.fb_read for I/O memory
- * @info: fb_info struct pointer
- * @buf: userspace buffer to read from framebuffer memory
- * @count: number of bytes to read from framebuffer memory
- * @ppos: read offset within framebuffer memory
- *
- * Returns:
- * The number of bytes read on success, or an error code otherwise.
- */
-ssize_t drm_fb_helper_cfb_read(struct fb_info *info, char __user *buf,
-                              size_t count, loff_t *ppos)
-{
-       return __drm_fb_helper_read(info, buf, count, ppos, fb_read_screen_base);
-}
-EXPORT_SYMBOL(drm_fb_helper_cfb_read);
-
-static ssize_t fb_write_screen_base(struct fb_info *info, const char __user *buf, size_t count,
-                                   loff_t pos)
-{
-       char __iomem *dst = info->screen_base + pos;
-       size_t alloc_size = min_t(size_t, count, PAGE_SIZE);
-       ssize_t ret = 0;
-       int err = 0;
-       u8 *tmp;
-
-       tmp = kmalloc(alloc_size, GFP_KERNEL);
-       if (!tmp)
-               return -ENOMEM;
-
-       while (count) {
-               size_t c = min_t(size_t, count, alloc_size);
-
-               if (copy_from_user(tmp, buf, c)) {
-                       err = -EFAULT;
-                       break;
-               }
-               memcpy_toio(dst, tmp, c);
-
-               dst += c;
-               buf += c;
-               ret += c;
-               count -= c;
-       }
-
-       kfree(tmp);
-
-       return ret ? ret : err;
-}
-
-/**
- * drm_fb_helper_cfb_write - Implements struct &fb_ops.fb_write for I/O memory
- * @info: fb_info struct pointer
- * @buf: userspace buffer to write to framebuffer memory
- * @count: number of bytes to write to framebuffer memory
- * @ppos: write offset within framebuffer memory
- *
- * Returns:
- * The number of bytes written on success, or an error code otherwise.
- */
-ssize_t drm_fb_helper_cfb_write(struct fb_info *info, const char __user *buf,
-                               size_t count, loff_t *ppos)
-{
-       struct drm_fb_helper *helper = info->par;
-       loff_t pos = *ppos;
-       ssize_t ret;
-       struct drm_rect damage_area;
-
-       ret = __drm_fb_helper_write(info, buf, count, ppos, fb_write_screen_base);
-       if (ret <= 0)
-               return ret;
-
-       if (helper->funcs->fb_dirty) {
-               drm_fb_helper_memory_range_to_clip(info, pos, ret, &damage_area);
-               drm_fb_helper_damage(helper, damage_area.x1, damage_area.y1,
-                                    drm_rect_width(&damage_area),
-                                    drm_rect_height(&damage_area));
-       }
-
-       return ret;
-}
-EXPORT_SYMBOL(drm_fb_helper_cfb_write);
-
-/**
- * drm_fb_helper_cfb_fillrect - wrapper around cfb_fillrect
- * @info: fbdev registered by the helper
- * @rect: info about rectangle to fill
- *
- * A wrapper around cfb_fillrect implemented by fbdev core
- */
-void drm_fb_helper_cfb_fillrect(struct fb_info *info,
-                               const struct fb_fillrect *rect)
-{
-       struct drm_fb_helper *helper = info->par;
-
-       cfb_fillrect(info, rect);
-
-       if (helper->funcs->fb_dirty)
-               drm_fb_helper_damage(helper, rect->dx, rect->dy, rect->width, rect->height);
-}
-EXPORT_SYMBOL(drm_fb_helper_cfb_fillrect);
-
-/**
- * drm_fb_helper_cfb_copyarea - wrapper around cfb_copyarea
- * @info: fbdev registered by the helper
- * @area: info about area to copy
- *
- * A wrapper around cfb_copyarea implemented by fbdev core
- */
-void drm_fb_helper_cfb_copyarea(struct fb_info *info,
-                               const struct fb_copyarea *area)
-{
-       struct drm_fb_helper *helper = info->par;
-
-       cfb_copyarea(info, area);
-
-       if (helper->funcs->fb_dirty)
-               drm_fb_helper_damage(helper, area->dx, area->dy, area->width, area->height);
-}
-EXPORT_SYMBOL(drm_fb_helper_cfb_copyarea);
-
-/**
- * drm_fb_helper_cfb_imageblit - wrapper around cfb_imageblit
- * @info: fbdev registered by the helper
- * @image: info about image to blit
- *
- * A wrapper around cfb_imageblit implemented by fbdev core
- */
-void drm_fb_helper_cfb_imageblit(struct fb_info *info,
-                                const struct fb_image *image)
-{
-       struct drm_fb_helper *helper = info->par;
-
-       cfb_imageblit(info, image);
-
-       if (helper->funcs->fb_dirty)
-               drm_fb_helper_damage(helper, image->dx, image->dy, image->width, image->height);
-}
-EXPORT_SYMBOL(drm_fb_helper_cfb_imageblit);
-
 /**
  * drm_fb_helper_set_suspend - wrapper around fb_set_suspend
  * @fb_helper: driver-allocated fbdev helper, can be NULL