From: Archit Taneja <architt@codeaurora.org>
To: dri-devel@lists.freedesktop.org, daniel@ffwll.ch
Cc: linux-arm-msm@vger.kernel.org, airlied@linux.ie,
"Archit Taneja" <architt@codeaurora.org>,
"Haixia Shi" <hshi@chromium.org>,
"Stéphane Marchesin" <marcheu@chromium.org>
Subject: [PATCH 21/25] drm/udl: Use new drm_fb_helper functions
Date: Mon, 13 Jul 2015 12:08:17 +0530 [thread overview]
Message-ID: <1436769501-4105-22-git-send-email-architt@codeaurora.org> (raw)
In-Reply-To: <1436769501-4105-1-git-send-email-architt@codeaurora.org>
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: David Airlie <airlied@linux.ie>
Cc: Haixia Shi <hshi@chromium.org>
Cc: "Stéphane Marchesin" <marcheu@chromium.org>
Signed-off-by: Archit Taneja <architt@codeaurora.org>
---
drivers/gpu/drm/udl/udl_fb.c | 40 ++++++++++++----------------------------
1 file changed, 12 insertions(+), 28 deletions(-)
diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
index 5fc16ce..9fd6e83 100644
--- a/drivers/gpu/drm/udl/udl_fb.c
+++ b/drivers/gpu/drm/udl/udl_fb.c
@@ -288,7 +288,7 @@ static void udl_fb_fillrect(struct fb_info *info, const struct fb_fillrect *rect
{
struct udl_fbdev *ufbdev = info->par;
- sys_fillrect(info, rect);
+ drm_fb_helper_sys_fillrect(info, rect);
udl_handle_damage(&ufbdev->ufb, rect->dx, rect->dy, rect->width,
rect->height);
@@ -298,7 +298,7 @@ static void udl_fb_copyarea(struct fb_info *info, const struct fb_copyarea *regi
{
struct udl_fbdev *ufbdev = info->par;
- sys_copyarea(info, region);
+ drm_fb_helper_sys_copyarea(info, region);
udl_handle_damage(&ufbdev->ufb, region->dx, region->dy, region->width,
region->height);
@@ -308,7 +308,7 @@ static void udl_fb_imageblit(struct fb_info *info, const struct fb_image *image)
{
struct udl_fbdev *ufbdev = info->par;
- sys_imageblit(info, image);
+ drm_fb_helper_sys_imageblit(info, image);
udl_handle_damage(&ufbdev->ufb, image->dx, image->dy, image->width,
image->height);
@@ -506,21 +506,20 @@ static int udlfb_create(struct drm_fb_helper *helper,
goto out_gfree;
}
- info = framebuffer_alloc(0, device);
- if (!info) {
- ret = -ENOMEM;
+ info = drm_fb_helper_alloc_fbi(helper);
+ if (IS_ERR(info)) {
+ ret = PTR_ERR(info);
goto out_gfree;
}
info->par = ufbdev;
ret = udl_framebuffer_init(dev, &ufbdev->ufb, &mode_cmd, obj);
if (ret)
- goto out_gfree;
+ goto out_destroy_fbi;
fb = &ufbdev->ufb.base;
ufbdev->helper.fb = fb;
- ufbdev->helper.fbdev = info;
strcpy(info->fix.id, "udldrmfb");
@@ -533,18 +532,13 @@ static int udlfb_create(struct drm_fb_helper *helper,
drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
drm_fb_helper_fill_var(info, &ufbdev->helper, sizes->fb_width, sizes->fb_height);
- ret = fb_alloc_cmap(&info->cmap, 256, 0);
- if (ret) {
- ret = -ENOMEM;
- goto out_gfree;
- }
-
-
DRM_DEBUG_KMS("allocated %dx%d vmal %p\n",
fb->width, fb->height,
ufbdev->ufb.obj->vmapping);
return ret;
+out_destroy_fbi:
+ drm_fb_helper_release_fbi(helper);
out_gfree:
drm_gem_object_unreference(&ufbdev->ufb.obj->base);
out:
@@ -558,14 +552,8 @@ static const struct drm_fb_helper_funcs udl_fb_helper_funcs = {
static void udl_fbdev_destroy(struct drm_device *dev,
struct udl_fbdev *ufbdev)
{
- struct fb_info *info;
- if (ufbdev->helper.fbdev) {
- info = ufbdev->helper.fbdev;
- unregister_framebuffer(info);
- if (info->cmap.len)
- fb_dealloc_cmap(&info->cmap);
- framebuffer_release(info);
- }
+ drm_fb_helper_unregister_fbi(&ufbdev->helper);
+ drm_fb_helper_release_fbi(&ufbdev->helper);
drm_fb_helper_fini(&ufbdev->helper);
drm_framebuffer_unregister_private(&ufbdev->ufb.base);
drm_framebuffer_cleanup(&ufbdev->ufb.base);
@@ -631,11 +619,7 @@ void udl_fbdev_unplug(struct drm_device *dev)
return;
ufbdev = udl->fbdev;
- if (ufbdev->helper.fbdev) {
- struct fb_info *info;
- info = ufbdev->helper.fbdev;
- unlink_framebuffer(info);
- }
+ drm_fb_helper_unlink_fbi(&ufbdev->helper);
}
struct drm_framebuffer *
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
next prev parent reply other threads:[~2015-07-13 6:38 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-13 6:37 [PATCH 00/25] drm: fb emulation: Step 1: Create new drm_fb_helper wrapper funcs Archit Taneja
2015-07-13 6:37 ` [PATCH 01/25] drm/fb_helper: Add drm_fb_helper functions to manage fb_info creation Archit Taneja
2015-07-13 6:37 ` [PATCH 02/25] drm/fb_helper: Create a wrapper for unlink_framebuffer Archit Taneja
2015-07-13 7:30 ` Daniel Vetter
2015-07-13 6:37 ` [PATCH 03/25] drm/fb_helper: Create wrappers for fb_sys_read/write funcs Archit Taneja
2015-07-13 7:31 ` Daniel Vetter
2015-07-13 9:59 ` Archit Taneja
2015-07-13 7:39 ` Daniel Vetter
2015-07-13 6:38 ` [PATCH 04/25] drm/fb_helper: Create wrappers for blit, copyarea and fillrect funcs Archit Taneja
2015-07-13 7:40 ` Daniel Vetter
2015-07-13 6:38 ` [PATCH 05/25] drm/fb_helper: Create a wrapper for fb_set_suspend Archit Taneja
2015-07-13 6:38 ` [PATCH 06/25] drm/fb_helper: Create a wrapper for remove_conflicting_framebuffers Archit Taneja
2015-07-13 6:38 ` [PATCH 07/25] drm/cirrus: Use new drm_fb_helper functions Archit Taneja
2015-07-13 6:38 ` [PATCH 08/25] drm/rockchip: " Archit Taneja
2015-07-13 6:38 ` [PATCH 09/25] drm/armada: " Archit Taneja
2015-07-13 6:38 ` [PATCH 10/25] drm/ast: " Archit Taneja
2015-07-13 6:38 ` [PATCH 11/25] drm/omap: " Archit Taneja
2015-07-13 6:38 ` [PATCH 12/25] drm/tegra: " Archit Taneja
2015-07-14 8:50 ` Thierry Reding
2015-07-14 9:11 ` Archit Taneja
2015-07-13 6:38 ` [PATCH 13/25] drm/msm: " Archit Taneja
2015-07-13 6:38 ` [PATCH 14/25] drm/exynos: " Archit Taneja
2015-08-11 9:04 ` Inki Dae
2015-08-11 9:11 ` Inki Dae
2015-07-13 6:38 ` [PATCH 15/25] drm/gma500: " Archit Taneja
2015-07-13 6:38 ` [PATCH 16/25] drm/mgag200: " Archit Taneja
2015-07-13 6:38 ` [PATCH 17/25] drm/radeon: " Archit Taneja
2015-07-13 6:38 ` [PATCH 18/25] drm/qxl: " Archit Taneja
2015-07-13 6:38 ` [PATCH 19/25] drm/i915: " Archit Taneja
2015-07-13 6:38 ` [PATCH 20/25] drm/nouveau: " Archit Taneja
2015-07-13 6:38 ` Archit Taneja [this message]
2015-07-13 6:38 ` [PATCH 22/25] drm/boschs: " Archit Taneja
2015-07-13 6:38 ` [PATCH 23/25] drm/amdgpu: " Archit Taneja
2015-07-13 6:38 ` [PATCH 24/25] drm/virtio: " Archit Taneja
2015-07-13 6:38 ` [PATCH 25/25] drm/fb_cma_helper: " Archit Taneja
2015-07-13 8:07 ` [PATCH 00/25] drm: fb emulation: Step 1: Create new drm_fb_helper wrapper funcs Daniel Vetter
2015-07-13 10:29 ` Archit Taneja
2015-07-13 14:11 ` Daniel Vetter
2015-07-13 15:25 ` Alex Deucher
2015-07-22 6:59 ` [PATCH v2 " Archit Taneja
2015-07-22 6:59 ` [PATCH v2 01/25] drm/fb_helper: Add drm_fb_helper functions to manage fb_info creation Archit Taneja
2015-07-22 6:59 ` [PATCH v2 02/25] drm/fb_helper: Create a wrapper for unlink_framebuffer Archit Taneja
2015-07-22 6:59 ` [PATCH v2 03/25] drm/fb_helper: Create wrappers for fb_sys_read/write funcs Archit Taneja
2015-07-22 6:59 ` [PATCH v2 04/25] drm/fb_helper: Create wrappers for blit, copyarea and fillrect funcs Archit Taneja
2015-07-22 6:59 ` [PATCH v2 05/25] drm/fb_helper: Create a wrapper for fb_set_suspend Archit Taneja
2015-07-22 6:59 ` [PATCH v2 06/25] drm/fb_helper: Create a wrapper for remove_conflicting_framebuffers Archit Taneja
2015-07-22 6:59 ` [PATCH v2 07/25] drm/cirrus: Use new drm_fb_helper functions Archit Taneja
2015-07-22 6:59 ` [PATCH v2 08/25] drm/rockchip: " Archit Taneja
2015-07-22 6:59 ` [PATCH v2 09/25] drm/armada: " Archit Taneja
2015-07-22 6:59 ` [PATCH v2 10/25] drm/ast: " Archit Taneja
2015-07-22 6:59 ` [PATCH v2 11/25] drm/omap: " Archit Taneja
2015-07-22 6:59 ` [PATCH v2 12/25] drm/tegra: " Archit Taneja
2015-07-22 6:59 ` [PATCH v2 13/25] drm/msm: " Archit Taneja
2015-07-22 6:59 ` [PATCH v2 14/25] drm/exynos: " Archit Taneja
2015-08-11 12:27 ` Inki Dae
2015-07-22 6:59 ` [PATCH v2 15/25] drm/gma500: " Archit Taneja
2015-07-22 6:59 ` [PATCH v2 16/25] drm/mgag200: " Archit Taneja
2015-07-22 6:59 ` [PATCH v2 17/25] drm/radeon: " Archit Taneja
2015-07-22 6:59 ` [PATCH v2 18/25] drm/qxl: " Archit Taneja
2015-07-22 6:59 ` [PATCH v2 19/25] drm/i915: " Archit Taneja
2015-07-22 6:59 ` [PATCH v2 20/25] drm/nouveau: " Archit Taneja
2015-07-22 6:59 ` [PATCH v2 21/25] drm/udl: " Archit Taneja
2015-07-22 6:59 ` [PATCH v2 22/25] drm/bochs: " Archit Taneja
2015-07-22 6:59 ` [PATCH v2 23/25] drm/amdgpu: " Archit Taneja
2015-07-22 7:00 ` [PATCH v2 24/25] drm/virtio: " Archit Taneja
2015-07-22 7:00 ` [PATCH v2 25/25] drm/fb_cma_helper: " Archit Taneja
2015-07-22 7:41 ` [PATCH v2 00/25] drm: fb emulation: Step 1: Create new drm_fb_helper wrapper funcs Daniel Vetter
2015-07-22 8:34 ` Archit Taneja
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1436769501-4105-22-git-send-email-architt@codeaurora.org \
--to=architt@codeaurora.org \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=hshi@chromium.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=marcheu@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).