drm/cirrus: Remove set but not used variable 'bo'

[platform/kernel/linux-starfive.git] / drivers / gpu / drm / cirrus / cirrus_fbdev.c

diff --git a/drivers/gpu/drm/cirrus/cirrus_fbdev.c b/drivers/gpu/drm/cirrus/cirrus_fbdev.c
index b643ac9..4dd499c 100644 (file)
--- a/drivers/gpu/drm/cirrus/cirrus_fbdev.c
+++ b/drivers/gpu/drm/cirrus/cirrus_fbdev.c
@@ -22,14 +22,14 @@ static void cirrus_dirty_update(struct cirrus_fbdev *afbdev,
        struct drm_gem_object *obj;
        struct cirrus_bo *bo;
        int src_offset, dst_offset;
-       int bpp = afbdev->gfb.format->cpp[0];
+       int bpp = afbdev->gfb->format->cpp[0];
        int ret = -EBUSY;
        bool unmap = false;
        bool store_for_later = false;
        int x2, y2;
        unsigned long flags;
 
-       obj = afbdev->gfb.obj[0];
+       obj = afbdev->gfb->obj[0];
        bo = gem_to_cirrus_bo(obj);
 
        /*
@@ -82,7 +82,7 @@ static void cirrus_dirty_update(struct cirrus_fbdev *afbdev,
        }
        for (i = y; i < y + height; i++) {
                /* assume equal stride for now */
-               src_offset = dst_offset = i * afbdev->gfb.pitches[0] + (x * bpp);
+               src_offset = dst_offset = i * afbdev->gfb->pitches[0] + (x * bpp);
                memcpy_toio(bo->kmap.virtual + src_offset, afbdev->sysram + src_offset, width * bpp);
 
        }
@@ -169,7 +169,6 @@ static int cirrusfb_create(struct drm_fb_helper *helper,
        struct drm_mode_fb_cmd2 mode_cmd;
        void *sysram;
        struct drm_gem_object *gobj = NULL;
-       struct cirrus_bo *bo = NULL;
        int size, ret;
 
        mode_cmd.width = sizes->surface_width;
@@ -185,30 +184,31 @@ static int cirrusfb_create(struct drm_fb_helper *helper,
                return ret;
        }
 
-       bo = gem_to_cirrus_bo(gobj);
-
        sysram = vmalloc(size);
        if (!sysram)
                return -ENOMEM;
 
        info = drm_fb_helper_alloc_fbi(helper);
-       if (IS_ERR(info))
-               return PTR_ERR(info);
+       if (IS_ERR(info)) {
+               ret = PTR_ERR(info);
+               goto err_vfree;
+       }
 
        info->par = gfbdev;
 
-       ret = cirrus_framebuffer_init(cdev->dev, &gfbdev->gfb, &mode_cmd, gobj);
+       fb = kzalloc(sizeof(*fb), GFP_KERNEL);
+       if (!fb) {
+               ret = -ENOMEM;
+               goto err_drm_gem_object_put_unlocked;
+       }
+
+       ret = cirrus_framebuffer_init(cdev->dev, fb, &mode_cmd, gobj);
        if (ret)
-               return ret;
+               goto err_kfree;
 
        gfbdev->sysram = sysram;
        gfbdev->size = size;
-
-       fb = &gfbdev->gfb;
-       if (!fb) {
-               DRM_INFO("fb is NULL\n");
-               return -EINVAL;
-       }
+       gfbdev->gfb = fb;
 
        /* setup helper */
        gfbdev->helper.fb = fb;
@@ -241,24 +241,27 @@ static int cirrusfb_create(struct drm_fb_helper *helper,
        DRM_INFO("   pitch is %d\n", fb->pitches[0]);
 
        return 0;
+
+err_kfree:
+       kfree(fb);
+err_drm_gem_object_put_unlocked:
+       drm_gem_object_put_unlocked(gobj);
+err_vfree:
+       vfree(sysram);
+       return ret;
 }
 
 static int cirrus_fbdev_destroy(struct drm_device *dev,
                                struct cirrus_fbdev *gfbdev)
 {
-       struct drm_framebuffer *gfb = &gfbdev->gfb;
+       struct drm_framebuffer *gfb = gfbdev->gfb;
 
        drm_fb_helper_unregister_fbi(&gfbdev->helper);
 
-       if (gfb->obj[0]) {
-               drm_gem_object_put_unlocked(gfb->obj[0]);
-               gfb->obj[0] = NULL;
-       }
-
        vfree(gfbdev->sysram);
        drm_fb_helper_fini(&gfbdev->helper);
-       drm_framebuffer_unregister_private(gfb);
-       drm_framebuffer_cleanup(gfb);
+       if (gfb)
+               drm_framebuffer_put(gfb);
 
        return 0;
 }
@@ -271,7 +274,6 @@ int cirrus_fbdev_init(struct cirrus_device *cdev)
 {
        struct cirrus_fbdev *gfbdev;
        int ret;
-       int bpp_sel = 24;
 
        /*bpp_sel = 8;*/
        gfbdev = kzalloc(sizeof(struct cirrus_fbdev), GFP_KERNEL);
@@ -296,7 +298,7 @@ int cirrus_fbdev_init(struct cirrus_device *cdev)
        /* disable all the possible outputs/crtcs before entering KMS mode */
        drm_helper_disable_unused_functions(cdev->dev);
 
-       return drm_fb_helper_initial_config(&gfbdev->helper, bpp_sel);
+       return drm_fb_helper_initial_config(&gfbdev->helper, cirrus_bpp);
 }
 
 void cirrus_fbdev_fini(struct cirrus_device *cdev)