drm/exynos: merge exynos_drm_buf.c to exynos_drm_gem.c

[deliverable/linux.git] / drivers / gpu / drm / exynos / exynos_drm_fbdev.c

diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
index e0b085b4bdfac33d1a8a5a436c8d5764a6fe33e8..624595afbce0ecf077f02a7064a8e2d38cac8e7d 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
@@ -40,8 +40,7 @@ static int exynos_drm_fb_mmap(struct fb_info *info,
 {
        struct drm_fb_helper *helper = info->par;
        struct exynos_drm_fbdev *exynos_fbd = to_exynos_fbdev(helper);
-       struct exynos_drm_gem_obj *exynos_gem_obj = exynos_fbd->exynos_gem_obj;
-       struct exynos_drm_gem_buf *buffer = exynos_gem_obj->buffer;
+       struct exynos_drm_gem_obj *obj = exynos_fbd->exynos_gem_obj;
        unsigned long vm_size;
        int ret;
 
@@ -49,11 +48,11 @@ static int exynos_drm_fb_mmap(struct fb_info *info,
 
        vm_size = vma->vm_end - vma->vm_start;
 
-       if (vm_size > buffer->size)
+       if (vm_size > obj->size)
                return -EINVAL;
 
-       ret = dma_mmap_attrs(helper->dev->dev, vma, buffer->pages,
-               buffer->dma_addr, buffer->size, &buffer->dma_attrs);
+       ret = dma_mmap_attrs(helper->dev->dev, vma, obj->pages, obj->dma_addr,
+                            obj->size, &obj->dma_attrs);
        if (ret < 0) {
                DRM_ERROR("failed to mmap.\n");
                return ret;
@@ -65,9 +64,9 @@ static int exynos_drm_fb_mmap(struct fb_info *info,
 static struct fb_ops exynos_drm_fb_ops = {
        .owner          = THIS_MODULE,
        .fb_mmap        = exynos_drm_fb_mmap,
-       .fb_fillrect    = cfb_fillrect,
-       .fb_copyarea    = cfb_copyarea,
-       .fb_imageblit   = cfb_imageblit,
+       .fb_fillrect    = drm_fb_helper_cfb_fillrect,
+       .fb_copyarea    = drm_fb_helper_cfb_copyarea,
+       .fb_imageblit   = drm_fb_helper_cfb_imageblit,
        .fb_check_var   = drm_fb_helper_check_var,
        .fb_set_par     = drm_fb_helper_set_par,
        .fb_blank       = drm_fb_helper_blank,
@@ -80,7 +79,7 @@ static int exynos_drm_fbdev_update(struct drm_fb_helper *helper,
                                     struct drm_framebuffer *fb)
 {
        struct fb_info *fbi = helper->fbdev;
-       struct exynos_drm_gem_buf *buffer;
+       struct exynos_drm_gem_obj *obj;
        unsigned int size = fb->width * fb->height * (fb->bits_per_pixel >> 3);
        unsigned int nr_pages;
        unsigned long offset;
@@ -89,18 +88,17 @@ static int exynos_drm_fbdev_update(struct drm_fb_helper *helper,
        drm_fb_helper_fill_var(fbi, helper, sizes->fb_width, sizes->fb_height);
 
        /* RGB formats use only one buffer */
-       buffer = exynos_drm_fb_buffer(fb, 0);
-       if (!buffer) {
-               DRM_DEBUG_KMS("buffer is null.\n");
+       obj = exynos_drm_fb_gem_obj(fb, 0);
+       if (!obj) {
+               DRM_DEBUG_KMS("gem object is null.\n");
                return -EFAULT;
        }
 
-       nr_pages = buffer->size >> PAGE_SHIFT;
+       nr_pages = obj->size >> PAGE_SHIFT;
 
-       buffer->kvaddr = (void __iomem *) vmap(buffer->pages,
-                       nr_pages, VM_MAP,
+       obj->kvaddr = (void __iomem *) vmap(obj->pages, nr_pages, VM_MAP,
                        pgprot_writecombine(PAGE_KERNEL));
-       if (!buffer->kvaddr) {
+       if (!obj->kvaddr) {
                DRM_ERROR("failed to map pages to kernel space.\n");
                return -EIO;
        }
@@ -111,7 +109,7 @@ static int exynos_drm_fbdev_update(struct drm_fb_helper *helper,
        offset = fbi->var.xoffset * (fb->bits_per_pixel >> 3);
        offset += fbi->var.yoffset * fb->pitches[0];
 
-       fbi->screen_base = buffer->kvaddr + offset;
+       fbi->screen_base = obj->kvaddr + offset;
        fbi->screen_size = size;
        fbi->fix.smem_len = size;
 
@@ -142,10 +140,10 @@ static int exynos_drm_fbdev_create(struct drm_fb_helper *helper,
 
        mutex_lock(&dev->struct_mutex);
 
-       fbi = framebuffer_alloc(0, &pdev->dev);
-       if (!fbi) {
+       fbi = drm_fb_helper_alloc_fbi(helper);
+       if (IS_ERR(fbi)) {
                DRM_ERROR("failed to allocate fb info.\n");
-               ret = -ENOMEM;
+               ret = PTR_ERR(fbi);
                goto out;
        }
 
@@ -165,7 +163,7 @@ static int exynos_drm_fbdev_create(struct drm_fb_helper *helper,
 
        if (IS_ERR(exynos_gem_obj)) {
                ret = PTR_ERR(exynos_gem_obj);
-               goto err_release_framebuffer;
+               goto err_release_fbi;
        }
 
        exynos_fbdev->exynos_gem_obj = exynos_gem_obj;
@@ -178,33 +176,23 @@ static int exynos_drm_fbdev_create(struct drm_fb_helper *helper,
                goto err_destroy_gem;
        }
 
-       helper->fbdev = fbi;
-
        fbi->par = helper;
        fbi->flags = FBINFO_FLAG_DEFAULT;
        fbi->fbops = &exynos_drm_fb_ops;
 
-       ret = fb_alloc_cmap(&fbi->cmap, 256, 0);
-       if (ret) {
-               DRM_ERROR("failed to allocate cmap.\n");
-               goto err_destroy_framebuffer;
-       }
-
        ret = exynos_drm_fbdev_update(helper, sizes, helper->fb);
        if (ret < 0)
-               goto err_dealloc_cmap;
+               goto err_destroy_framebuffer;
 
        mutex_unlock(&dev->struct_mutex);
        return ret;
 
-err_dealloc_cmap:
-       fb_dealloc_cmap(&fbi->cmap);
 err_destroy_framebuffer:
        drm_framebuffer_cleanup(helper->fb);
 err_destroy_gem:
        exynos_drm_gem_destroy(exynos_gem_obj);
-err_release_framebuffer:
-       framebuffer_release(fbi);
+err_release_fbi:
+       drm_fb_helper_release_fbi(helper);
 
 /*
  * if failed, all resources allocated above would be released by
@@ -300,8 +288,8 @@ static void exynos_drm_fbdev_destroy(struct drm_device *dev,
        struct exynos_drm_gem_obj *exynos_gem_obj = exynos_fbd->exynos_gem_obj;
        struct drm_framebuffer *fb;
 
-       if (exynos_gem_obj->buffer->kvaddr)
-               vunmap(exynos_gem_obj->buffer->kvaddr);
+       if (exynos_gem_obj->kvaddr)
+               vunmap(exynos_gem_obj->kvaddr);
 
        /* release drm framebuffer and real buffer */
        if (fb_helper->fb && fb_helper->fb->funcs) {
@@ -312,21 +300,8 @@ static void exynos_drm_fbdev_destroy(struct drm_device *dev,
                }
        }
 
-       /* release linux framebuffer */
-       if (fb_helper->fbdev) {
-               struct fb_info *info;
-               int ret;
-
-               info = fb_helper->fbdev;
-               ret = unregister_framebuffer(info);
-               if (ret < 0)
-                       DRM_DEBUG_KMS("failed unregister_framebuffer()\n");
-
-               if (info->cmap.len)
-                       fb_dealloc_cmap(&info->cmap);
-
-               framebuffer_release(info);
-       }
+       drm_fb_helper_unregister_fbi(fb_helper);
+       drm_fb_helper_release_fbi(fb_helper);
 
        drm_fb_helper_fini(fb_helper);
 }