drm/nouveau: Use new drm_fb_helper functions

Use the newly created wrapper drm_fb_helper functions instead of calling
core fbdev functions directly. They also simplify the fb_info creation.

v3:
- Don't touch remove_conflicting_framebuffers

v2:
- remove unused variable pdev in nouveau_fbcon_create

Cc: David Airlie <airlied@linux.ie>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Alexandre Courbot <acourbot@nvidia.com>

Signed-off-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 12 insertions, 27 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index 6751553abe4a..2791701685dc 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -84,7 +84,7 @@ nouveau_fbcon_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
 
         if (ret != -ENODEV)
                 nouveau_fbcon_gpu_lockup(info);
-        cfb_fillrect(info, rect);
+        drm_fb_helper_cfb_fillrect(info, rect);
 }
 
 static void
@@ -116,7 +116,7 @@ nouveau_fbcon_copyarea(struct fb_info *info, const struct fb_copyarea *image)
 
         if (ret != -ENODEV)
                 nouveau_fbcon_gpu_lockup(info);
-        cfb_copyarea(info, image);
+        drm_fb_helper_cfb_copyarea(info, image);
 }
 
 static void
@@ -148,7 +148,7 @@ nouveau_fbcon_imageblit(struct fb_info *info, const struct fb_image *image)
 
         if (ret != -ENODEV)
                 nouveau_fbcon_gpu_lockup(info);
-        cfb_imageblit(info, image);
+        drm_fb_helper_cfb_imageblit(info, image);
 }
 
 static int
@@ -197,9 +197,9 @@ static struct fb_ops nouveau_fbcon_sw_ops = {
         .owner = THIS_MODULE,
         .fb_check_var = drm_fb_helper_check_var,
         .fb_set_par = drm_fb_helper_set_par,
-        .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_pan_display = drm_fb_helper_pan_display,
         .fb_blank = drm_fb_helper_blank,
         .fb_setcmap = drm_fb_helper_setcmap,
@@ -319,7 +319,6 @@ nouveau_fbcon_create(struct drm_fb_helper *helper,
         struct nouveau_channel *chan;
         struct nouveau_bo *nvbo;
         struct drm_mode_fb_cmd2 mode_cmd;
-        struct pci_dev *pdev = dev->pdev;
         int size, ret;
 
         mode_cmd.width = sizes->surface_width;
@@ -365,20 +364,13 @@ nouveau_fbcon_create(struct drm_fb_helper *helper,
 
         mutex_lock(&dev->struct_mutex);
 
-        info = framebuffer_alloc(0, &pdev->dev);
-        if (!info) {
-                ret = -ENOMEM;
+        info = drm_fb_helper_alloc_fbi(helper);
+        if (IS_ERR(info)) {
+                ret = PTR_ERR(info);
                 goto out_unlock;
         }
         info->skip_vt_switch = 1;
 
-        ret = fb_alloc_cmap(&info->cmap, 256, 0);
-        if (ret) {
-                ret = -ENOMEM;
-                framebuffer_release(info);
-                goto out_unlock;
-        }
-
         info->par = fbcon;
 
         nouveau_framebuffer_init(dev, &fbcon->nouveau_fb, &mode_cmd, nvbo);
@@ -388,7 +380,6 @@ nouveau_fbcon_create(struct drm_fb_helper *helper,
 
         /* setup helper */
         fbcon->helper.fb = fb;
-        fbcon->helper.fbdev = info;
 
         strcpy(info->fix.id, "nouveaufb");
         if (!chan)
@@ -450,15 +441,9 @@ static int
 nouveau_fbcon_destroy(struct drm_device *dev, struct nouveau_fbdev *fbcon)
 {
         struct nouveau_framebuffer *nouveau_fb = &fbcon->nouveau_fb;
-        struct fb_info *info;
 
-        if (fbcon->helper.fbdev) {
-                info = fbcon->helper.fbdev;
-                unregister_framebuffer(info);
-                if (info->cmap.len)
-                        fb_dealloc_cmap(&info->cmap);
-                framebuffer_release(info);
-        }
+        drm_fb_helper_unregister_fbi(&fbcon->helper);
+        drm_fb_helper_release_fbi(&fbcon->helper);
 
         if (nouveau_fb->nvbo) {
                 nouveau_bo_unmap(nouveau_fb->nvbo);
@@ -496,7 +481,7 @@ nouveau_fbcon_set_suspend(struct drm_device *dev, int state)
                 console_lock();
                 if (state == FBINFO_STATE_RUNNING)
                         nouveau_fbcon_accel_restore(dev);
-                fb_set_suspend(drm->fbcon->helper.fbdev, state);
+                drm_fb_helper_set_suspend(&drm->fbcon->helper, state);
                 if (state != FBINFO_STATE_RUNNING)
                         nouveau_fbcon_accel_save_disable(dev);
                 console_unlock();