| Message ID | 1436769501-4105-15-git-send-email-architt@codeaurora.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | Andy Gross |
| Headers | show |
On 2015? 07? 13? 15:38, Archit Taneja wrote: > Use the newly created wrapper drm_fb_helper functions instead of calling > core fbdev functions directly. They also simplify the fb_info creation. > > COMPILE TESTED ONLY. > > Cc: Inki Dae <inki.dae@samsung.com> > Cc: Joonyoung Shim <jy0922.shim@samsung.com> > Cc: Seung-Woo Kim <sw0312.kim@samsung.com> > > Signed-off-by: Archit Taneja <architt@codeaurora.org> > --- > drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 45 +++++++++---------------------- > 1 file changed, 12 insertions(+), 33 deletions(-) > > diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c > index e0b085b..6975b70 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c > @@ -65,9 +65,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, > @@ -142,10 +142,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 +165,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,21 +178,13 @@ 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; With above change, err_dealloc_cmap label isn't used anymore so you need to remove below lines, err_dealloc_cmap: fb_dealloc_cmap(&fbi->cmap); Thanks, Inki Dae > > mutex_unlock(&dev->struct_mutex); > return ret; > @@ -203,8 +195,8 @@ 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 > @@ -312,21 +304,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); > } > -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 2015? 08? 11? 18:04, Inki Dae wrote: > On 2015? 07? 13? 15:38, Archit Taneja wrote: >> Use the newly created wrapper drm_fb_helper functions instead of calling >> core fbdev functions directly. They also simplify the fb_info creation. >> >> COMPILE TESTED ONLY. >> >> Cc: Inki Dae <inki.dae@samsung.com> >> Cc: Joonyoung Shim <jy0922.shim@samsung.com> >> Cc: Seung-Woo Kim <sw0312.kim@samsung.com> >> >> Signed-off-by: Archit Taneja <architt@codeaurora.org> >> --- >> drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 45 +++++++++---------------------- >> 1 file changed, 12 insertions(+), 33 deletions(-) >> >> diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c >> index e0b085b..6975b70 100644 >> --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c >> +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c >> @@ -65,9 +65,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, >> @@ -142,10 +142,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 +165,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,21 +178,13 @@ 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; > > With above change, err_dealloc_cmap label isn't used anymore so you need > to remove below lines, > > err_dealloc_cmap: > fb_dealloc_cmap(&fbi->cmap); Oops, Sorry. You already posted v2 and there is no warning. Please ignore it. Thanks, Inki Dae > > Thanks, > Inki Dae > >> >> mutex_unlock(&dev->struct_mutex); >> return ret; >> @@ -203,8 +195,8 @@ 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 >> @@ -312,21 +304,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); >> } >> > -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c index e0b085b..6975b70 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c @@ -65,9 +65,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, @@ -142,10 +142,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 +165,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,21 +178,13 @@ 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; @@ -203,8 +195,8 @@ 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 @@ -312,21 +304,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); }
Use the newly created wrapper drm_fb_helper functions instead of calling core fbdev functions directly. They also simplify the fb_info creation. COMPILE TESTED ONLY. Cc: Inki Dae <inki.dae@samsung.com> Cc: Joonyoung Shim <jy0922.shim@samsung.com> Cc: Seung-Woo Kim <sw0312.kim@samsung.com> Signed-off-by: Archit Taneja <architt@codeaurora.org> --- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 45 +++++++++---------------------- 1 file changed, 12 insertions(+), 33 deletions(-)