From: Archit Taneja <architt@codeaurora.org>
To: dri-devel@lists.freedesktop.org, daniel@ffwll.ch
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: [PATCH v2 15/25] drm/gma500: Use new drm_fb_helper functions
Date: Wed, 22 Jul 2015 12:29:51 +0530 [thread overview]
Message-ID: <1437548401-10125-16-git-send-email-architt@codeaurora.org> (raw)
In-Reply-To: <1437548401-10125-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: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Archit Taneja <architt@codeaurora.org>
---
drivers/gpu/drm/gma500/accel_2d.c | 6 ++---
drivers/gpu/drm/gma500/framebuffer.c | 48 ++++++++++++------------------------
2 files changed, 19 insertions(+), 35 deletions(-)
diff --git a/drivers/gpu/drm/gma500/accel_2d.c b/drivers/gpu/drm/gma500/accel_2d.c
index de6f62a..db9f7d0 100644
--- a/drivers/gpu/drm/gma500/accel_2d.c
+++ b/drivers/gpu/drm/gma500/accel_2d.c
@@ -276,12 +276,12 @@ static void psbfb_copyarea_accel(struct fb_info *info,
break;
default:
/* software fallback */
- cfb_copyarea(info, a);
+ drm_fb_helper_cfb_copyarea(info, a);
return;
}
if (!gma_power_begin(dev, false)) {
- cfb_copyarea(info, a);
+ drm_fb_helper_cfb_copyarea(info, a);
return;
}
psb_accel_2d_copy(dev_priv,
@@ -308,7 +308,7 @@ void psbfb_copyarea(struct fb_info *info,
/* Avoid the 8 pixel erratum */
if (region->width == 8 || region->height == 8 ||
(info->flags & FBINFO_HWACCEL_DISABLED))
- return cfb_copyarea(info, region);
+ return drm_fb_helper_cfb_copyarea(info, region);
psbfb_copyarea_accel(info, region);
}
diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
index 2d42ce6..2eaf1b3 100644
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -194,9 +194,9 @@ static struct fb_ops psbfb_ops = {
.fb_set_par = drm_fb_helper_set_par,
.fb_blank = drm_fb_helper_blank,
.fb_setcolreg = psbfb_setcolreg,
- .fb_fillrect = cfb_fillrect,
+ .fb_fillrect = drm_fb_helper_cfb_fillrect,
.fb_copyarea = psbfb_copyarea,
- .fb_imageblit = cfb_imageblit,
+ .fb_imageblit = drm_fb_helper_cfb_imageblit,
.fb_mmap = psbfb_mmap,
.fb_sync = psbfb_sync,
.fb_ioctl = psbfb_ioctl,
@@ -208,9 +208,9 @@ static struct fb_ops psbfb_roll_ops = {
.fb_set_par = drm_fb_helper_set_par,
.fb_blank = drm_fb_helper_blank,
.fb_setcolreg = psbfb_setcolreg,
- .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 = psbfb_pan,
.fb_mmap = psbfb_mmap,
.fb_ioctl = psbfb_ioctl,
@@ -222,9 +222,9 @@ static struct fb_ops psbfb_unaccel_ops = {
.fb_set_par = drm_fb_helper_set_par,
.fb_blank = drm_fb_helper_blank,
.fb_setcolreg = psbfb_setcolreg,
- .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_mmap = psbfb_mmap,
.fb_ioctl = psbfb_ioctl,
};
@@ -343,7 +343,6 @@ static int psbfb_create(struct psb_fbdev *fbdev,
struct drm_framebuffer *fb;
struct psb_framebuffer *psbfb = &fbdev->pfb;
struct drm_mode_fb_cmd2 mode_cmd;
- struct device *device = &dev->pdev->dev;
int size;
int ret;
struct gtt_range *backing;
@@ -409,9 +408,9 @@ static int psbfb_create(struct psb_fbdev *fbdev,
mutex_lock(&dev->struct_mutex);
- info = framebuffer_alloc(0, device);
- if (!info) {
- ret = -ENOMEM;
+ info = drm_fb_helper_alloc_fbi(&fbdev->psb_fb_helper);
+ if (IS_ERR(info)) {
+ ret = PTR_ERR(info);
goto out_err1;
}
info->par = fbdev;
@@ -426,7 +425,6 @@ static int psbfb_create(struct psb_fbdev *fbdev,
psbfb->fbdev = info;
fbdev->psb_fb_helper.fb = fb;
- fbdev->psb_fb_helper.fbdev = info;
drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
strcpy(info->fix.id, "psbdrmfb");
@@ -440,12 +438,6 @@ static int psbfb_create(struct psb_fbdev *fbdev,
} else /* Software */
info->fbops = &psbfb_unaccel_ops;
- ret = fb_alloc_cmap(&info->cmap, 256, 0);
- if (ret) {
- ret = -ENOMEM;
- goto out_unref;
- }
-
info->fix.smem_start = dev->mode_config.fb_base;
info->fix.smem_len = size;
info->fix.ywrapstep = gtt_roll;
@@ -456,11 +448,6 @@ static int psbfb_create(struct psb_fbdev *fbdev,
info->screen_size = size;
if (dev_priv->gtt.stolen_size) {
- info->apertures = alloc_apertures(1);
- if (!info->apertures) {
- ret = -ENOMEM;
- goto out_unref;
- }
info->apertures->ranges[0].base = dev->mode_config.fb_base;
info->apertures->ranges[0].size = dev_priv->gtt.stolen_size;
}
@@ -483,6 +470,8 @@ out_unref:
psb_gtt_free_range(dev, backing);
else
drm_gem_object_unreference(&backing->gem);
+
+ drm_fb_helper_release_fbi(&fbdev->psb_fb_helper);
out_err1:
mutex_unlock(&dev->struct_mutex);
psb_gtt_free_range(dev, backing);
@@ -570,16 +559,11 @@ static const struct drm_fb_helper_funcs psb_fb_helper_funcs = {
static int psb_fbdev_destroy(struct drm_device *dev, struct psb_fbdev *fbdev)
{
- struct fb_info *info;
struct psb_framebuffer *psbfb = &fbdev->pfb;
- if (fbdev->psb_fb_helper.fbdev) {
- info = fbdev->psb_fb_helper.fbdev;
- unregister_framebuffer(info);
- if (info->cmap.len)
- fb_dealloc_cmap(&info->cmap);
- framebuffer_release(info);
- }
+ drm_fb_helper_unregister_fbi(&fbdev->psb_fb_helper);
+ drm_fb_helper_release_fbi(&fbdev->psb_fb_helper);
+
drm_fb_helper_fini(&fbdev->psb_fb_helper);
drm_framebuffer_unregister_private(&psbfb->base);
drm_framebuffer_cleanup(&psbfb->base);
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2015-07-22 7:01 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 ` [PATCH 21/25] drm/udl: " Archit Taneja
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 ` Archit Taneja [this message]
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=1437548401-10125-16-git-send-email-architt@codeaurora.org \
--to=architt@codeaurora.org \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.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).