drm/exynos: remove buffer creation of fbdev from drm framebuffer creation

The fbdev fb and the user fb is created from same function -
exynos_drm_fb_create, but this function creates not only drm framebuffer
but buffer of fbdev. Remove it because it complicates codes and use
exynos_drm_gem_create() than exynos_drm_buf_create() to create buffer of
fbdev, it give better consistency of codes and more clear
implementation.

Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>

1 files changed, 27 insertions, 109 deletions

diff --git a/drivers/gpu/drm/exynos/exynos_drm_fb.c b/drivers/gpu/drm/exynos/exynos_drm_fb.c
index 5231759dfd47..8f36ae5e5d71 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fb.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fb.c
@@ -43,14 +43,10 @@
  *
  * @fb: drm framebuffer obejct.
  * @exynos_gem_obj: exynos specific gem object containing a gem object.
- * @buffer: pointer to exynos_drm_gem_buffer object.
- *      - contain the memory information to memory region allocated
- *      at default framebuffer creation.
  */
 struct exynos_drm_fb {
         struct drm_framebuffer          fb;
         struct exynos_drm_gem_obj       *exynos_gem_obj;
-        struct exynos_drm_gem_buf       *buffer;
 };
 
 static void exynos_drm_fb_destroy(struct drm_framebuffer *fb)
@@ -61,13 +57,6 @@ static void exynos_drm_fb_destroy(struct drm_framebuffer *fb)
 
         drm_framebuffer_cleanup(fb);
 
-        /*
-         * default framebuffer has no gem object so
-         * a buffer of the default framebuffer should be released at here.
-         */
-        if (!exynos_fb->exynos_gem_obj && exynos_fb->buffer)
-                exynos_drm_buf_destroy(fb->dev, exynos_fb->buffer);
-
         kfree(exynos_fb);
         exynos_fb = NULL;
 }
@@ -102,120 +91,49 @@ static struct drm_framebuffer_funcs exynos_drm_fb_funcs = {
         .dirty          = exynos_drm_fb_dirty,
 };
 
-static struct drm_framebuffer *
-exynos_drm_fb_init(struct drm_file *file_priv, struct drm_device *dev,
-                   struct drm_mode_fb_cmd2 *mode_cmd)
+struct drm_framebuffer *
+exynos_drm_framebuffer_init(struct drm_device *dev,
+                            struct drm_mode_fb_cmd2 *mode_cmd,
+                            struct drm_gem_object *obj)
 {
         struct exynos_drm_fb *exynos_fb;
-        struct drm_framebuffer *fb;
-        struct exynos_drm_gem_obj *exynos_gem_obj = NULL;
-        struct drm_gem_object *obj;
-        unsigned int size;
         int ret;
 
-        DRM_DEBUG_KMS("%s\n", __FILE__);
-
-        DRM_LOG_KMS("drm fb create(%dx%d)\n",
-                        mode_cmd->width, mode_cmd->height);
-
         exynos_fb = kzalloc(sizeof(*exynos_fb), GFP_KERNEL);
         if (!exynos_fb) {
-                DRM_ERROR("failed to allocate exynos drm framebuffer.\n");
+                DRM_ERROR("failed to allocate exynos drm framebuffer\n");
                 return ERR_PTR(-ENOMEM);
         }
 
-        fb = &exynos_fb->fb;
-        ret = drm_framebuffer_init(dev, fb, &exynos_drm_fb_funcs);
+        ret = drm_framebuffer_init(dev, &exynos_fb->fb, &exynos_drm_fb_funcs);
         if (ret) {
-                DRM_ERROR("failed to initialize framebuffer.\n");
-                goto err_init;
+                DRM_ERROR("failed to initialize framebuffer\n");
+                return ERR_PTR(ret);
         }
 
-        DRM_LOG_KMS("create: fb id: %d\n", fb->base.id);
-
-        size = mode_cmd->pitches[0] * mode_cmd->height;
-
-        /*
-         * mode_cmd->handles[0] could be NULL at booting time or
-         * with user request. if NULL, a new buffer or a gem object
-         * would be allocated.
-         */
-        if (!mode_cmd->handles[0]) {
-                if (!file_priv) {
-                        struct exynos_drm_gem_buf *buffer;
-
-                        /*
-                         * in case that file_priv is NULL, it allocates
-                         * only buffer and this buffer would be used
-                         * for default framebuffer.
-                         */
-                        buffer = exynos_drm_buf_create(dev, size);
-                        if (!buffer) {
-                                ret = -ENOMEM;
-                                goto err_buffer;
-                        }
-
-                        exynos_fb->buffer = buffer;
-
-                        DRM_LOG_KMS("default: dma_addr = 0x%lx, size = 0x%x\n",
-                                        (unsigned long)buffer->dma_addr, size);
-
-                        goto out;
-                } else {
-                        exynos_gem_obj = exynos_drm_gem_create(dev, size);
-                        if (IS_ERR(exynos_gem_obj)) {
-                                ret = PTR_ERR(exynos_gem_obj);
-                                goto err_buffer;
-                        }
-                }
-        } else {
-                obj = drm_gem_object_lookup(dev, file_priv,
-                                mode_cmd->handles[0]);
-                if (!obj) {
-                        DRM_ERROR("failed to lookup gem object.\n");
-                        goto err_buffer;
-                }
-
-                exynos_gem_obj = to_exynos_gem_obj(obj);
-
-                drm_gem_object_unreference_unlocked(obj);
-        }
-
-        /*
-         * if got a exynos_gem_obj from either a handle or
-         * a new creation then exynos_fb->exynos_gem_obj is NULL
-         * so that default framebuffer has no its own gem object,
-         * only its own buffer object.
-         */
-        exynos_fb->buffer = exynos_gem_obj->buffer;
-
-        DRM_LOG_KMS("dma_addr = 0x%lx, size = 0x%x, gem object = 0x%x\n",
-                        (unsigned long)exynos_fb->buffer->dma_addr, size,
-                        (unsigned int)&exynos_gem_obj->base);
-
-out:
-        exynos_fb->exynos_gem_obj = exynos_gem_obj;
-
-        drm_helper_mode_fill_fb_struct(fb, mode_cmd);
+        drm_helper_mode_fill_fb_struct(&exynos_fb->fb, mode_cmd);
+        exynos_fb->exynos_gem_obj = to_exynos_gem_obj(obj);
 
-        return fb;
-
-err_buffer:
-        drm_framebuffer_cleanup(fb);
-
-err_init:
-        kfree(exynos_fb);
-
-        return ERR_PTR(ret);
+        return &exynos_fb->fb;
 }
 
-struct drm_framebuffer *exynos_drm_fb_create(struct drm_device *dev,
-                                             struct drm_file *file_priv,
-                                             struct drm_mode_fb_cmd2 *mode_cmd)
+static struct drm_framebuffer *
+exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv,
+                      struct drm_mode_fb_cmd2 *mode_cmd)
 {
+        struct drm_gem_object *obj;
+
         DRM_DEBUG_KMS("%s\n", __FILE__);
 
-        return exynos_drm_fb_init(file_priv, dev, mode_cmd);
+        obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]);
+        if (!obj) {
+                DRM_ERROR("failed to lookup gem object\n");
+                return ERR_PTR(-ENOENT);
+        }
+
+        drm_gem_object_unreference_unlocked(obj);
+
+        return exynos_drm_framebuffer_init(dev, mode_cmd, obj);
 }
 
 struct exynos_drm_gem_buf *exynos_drm_fb_get_buf(struct drm_framebuffer *fb)
@@ -225,7 +143,7 @@ struct exynos_drm_gem_buf *exynos_drm_fb_get_buf(struct drm_framebuffer *fb)
 
         DRM_DEBUG_KMS("%s\n", __FILE__);
 
-        buffer = exynos_fb->buffer;
+        buffer = exynos_fb->exynos_gem_obj->buffer;
         if (!buffer)
                 return NULL;
 
@@ -246,7 +164,7 @@ static void exynos_drm_output_poll_changed(struct drm_device *dev)
 }
 
 static struct drm_mode_config_funcs exynos_drm_mode_config_funcs = {
-        .fb_create = exynos_drm_fb_create,
+        .fb_create = exynos_user_fb_create,
         .output_poll_changed = exynos_drm_output_poll_changed,
 };