2 files changed, 13 insertions, 27 deletions

diff --git a/drivers/gpu/drm/bochs/bochs_drv.c b/drivers/gpu/drm/bochs/bochs_drv.c
index 98837bde2d25..7f1a3604b19f 100644
--- a/drivers/gpu/drm/bochs/bochs_drv.c
+++ b/drivers/gpu/drm/bochs/bochs_drv.c
@@ -109,7 +109,7 @@ static int bochs_pm_suspend(struct device *dev)
 
         if (bochs->fb.initialized) {
                 console_lock();
-                fb_set_suspend(bochs->fb.helper.fbdev, 1);
+                drm_fb_helper_set_suspend(&bochs->fb.helper, 1);
                 console_unlock();
         }
 
@@ -126,7 +126,7 @@ static int bochs_pm_resume(struct device *dev)
 
         if (bochs->fb.initialized) {
                 console_lock();
-                fb_set_suspend(bochs->fb.helper.fbdev, 0);
+                drm_fb_helper_set_suspend(&bochs->fb.helper, 0);
                 console_unlock();
         }
 
diff --git a/drivers/gpu/drm/bochs/bochs_fbdev.c b/drivers/gpu/drm/bochs/bochs_fbdev.c
index 976d9798dc99..09a0637aab3e 100644
--- a/drivers/gpu/drm/bochs/bochs_fbdev.c
+++ b/drivers/gpu/drm/bochs/bochs_fbdev.c
@@ -24,9 +24,9 @@ static struct fb_ops bochsfb_ops = {
         .owner = THIS_MODULE,
         .fb_check_var = drm_fb_helper_check_var,
         .fb_set_par = drm_fb_helper_set_par,
-        .fb_fillrect = sys_fillrect,
-        .fb_copyarea = sys_copyarea,
-        .fb_imageblit = sys_imageblit,
+        .fb_fillrect = drm_fb_helper_sys_fillrect,
+        .fb_copyarea = drm_fb_helper_sys_copyarea,
+        .fb_imageblit = drm_fb_helper_sys_imageblit,
         .fb_pan_display = drm_fb_helper_pan_display,
         .fb_blank = drm_fb_helper_blank,
         .fb_setcmap = drm_fb_helper_setcmap,
@@ -56,11 +56,9 @@ static int bochsfb_create(struct drm_fb_helper *helper,
 {
         struct bochs_device *bochs =
                 container_of(helper, struct bochs_device, fb.helper);
-        struct drm_device *dev = bochs->dev;
         struct fb_info *info;
         struct drm_framebuffer *fb;
         struct drm_mode_fb_cmd2 mode_cmd;
-        struct device *device = &dev->pdev->dev;
         struct drm_gem_object *gobj = NULL;
         struct bochs_bo *bo = NULL;
         int size, ret;
@@ -106,22 +104,23 @@ static int bochsfb_create(struct drm_fb_helper *helper,
         ttm_bo_unreserve(&bo->bo);
 
         /* init fb device */
-        info = framebuffer_alloc(0, device);
-        if (info == NULL)
-                return -ENOMEM;
+        info = drm_fb_helper_alloc_fbi(helper);
+        if (IS_ERR(info))
+                return PTR_ERR(info);
 
         info->par = &bochs->fb.helper;
 
         ret = bochs_framebuffer_init(bochs->dev, &bochs->fb.gfb, &mode_cmd, gobj);
-        if (ret)
+        if (ret) {
+                drm_fb_helper_release_fbi(helper);
                 return ret;
+        }
 
         bochs->fb.size = size;
 
         /* setup helper */
         fb = &bochs->fb.gfb.base;
         bochs->fb.helper.fb = fb;
-        bochs->fb.helper.fbdev = info;
 
         strcpy(info->fix.id, "bochsdrmfb");
 
@@ -139,30 +138,17 @@ static int bochsfb_create(struct drm_fb_helper *helper,
         info->fix.smem_start = 0;
         info->fix.smem_len = size;
 
-        ret = fb_alloc_cmap(&info->cmap, 256, 0);
-        if (ret) {
-                DRM_ERROR("%s: can't allocate color map\n", info->fix.id);
-                return -ENOMEM;
-        }
-
         return 0;
 }
 
 static int bochs_fbdev_destroy(struct bochs_device *bochs)
 {
         struct bochs_framebuffer *gfb = &bochs->fb.gfb;
-        struct fb_info *info;
 
         DRM_DEBUG_DRIVER("\n");
 
-        if (bochs->fb.helper.fbdev) {
-                info = bochs->fb.helper.fbdev;
-
-                unregister_framebuffer(info);
-                if (info->cmap.len)
-                        fb_dealloc_cmap(&info->cmap);
-                framebuffer_release(info);
-        }
+        drm_fb_helper_unregister_fbi(&bochs->fb.helper);
+        drm_fb_helper_release_fbi(&bochs->fb.helper);
 
         if (gfb->obj) {
                 drm_gem_object_unreference_unlocked(gfb->obj);