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>,
Tomi Valkeinen <tomi.valkeinen@ti.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Subject: [PATCH 11/25] drm/omap: Use new drm_fb_helper functions
Date: Mon, 13 Jul 2015 12:08:07 +0530 [thread overview]
Message-ID: <1436769501-4105-12-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: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Archit Taneja <architt@codeaurora.org>
---
drivers/gpu/drm/omapdrm/omap_fbdev.c | 34 +++++++++++-----------------------
1 file changed, 11 insertions(+), 23 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c
index 23b5a84..a388a85 100644
--- a/drivers/gpu/drm/omapdrm/omap_fbdev.c
+++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c
@@ -86,11 +86,11 @@ static struct fb_ops omap_fb_ops = {
/* Note: to properly handle manual update displays, we wrap the
* basic fbdev ops which write to the framebuffer
*/
- .fb_read = fb_sys_read,
- .fb_write = fb_sys_write,
- .fb_fillrect = sys_fillrect,
- .fb_copyarea = sys_copyarea,
- .fb_imageblit = sys_imageblit,
+ .fb_read = drm_fb_helper_sys_read,
+ .fb_write = drm_fb_helper_sys_write,
+ .fb_fillrect = drm_fb_helper_sys_fillrect,
+ .fb_copyarea = drm_fb_helper_sys_copyarea,
+ .fb_imageblit = drm_fb_helper_sys_imageblit,
.fb_check_var = drm_fb_helper_check_var,
.fb_set_par = drm_fb_helper_set_par,
@@ -179,7 +179,7 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
mutex_lock(&dev->struct_mutex);
- fbi = framebuffer_alloc(0, dev->dev);
+ fbi = drm_fb_helper_alloc_fbi(helper);
if (!fbi) {
dev_err(dev->dev, "failed to allocate fb info\n");
ret = -ENOMEM;
@@ -190,7 +190,6 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
fbdev->fb = fb;
helper->fb = fb;
- helper->fbdev = fbi;
fbi->par = helper;
fbi->flags = FBINFO_DEFAULT;
@@ -198,12 +197,6 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
strcpy(fbi->fix.id, MODULE_NAME);
- ret = fb_alloc_cmap(&fbi->cmap, 256, 0);
- if (ret) {
- ret = -ENOMEM;
- goto fail_unlock;
- }
-
drm_fb_helper_fill_fix(fbi, fb->pitches[0], fb->depth);
drm_fb_helper_fill_var(fbi, helper, sizes->fb_width, sizes->fb_height);
@@ -236,8 +229,9 @@ fail_unlock:
fail:
if (ret) {
- if (fbi)
- framebuffer_release(fbi);
+
+ drm_fb_helper_release_fbi(helper);
+
if (fb) {
drm_framebuffer_unregister_private(fb);
drm_framebuffer_remove(fb);
@@ -312,17 +306,11 @@ void omap_fbdev_free(struct drm_device *dev)
struct omap_drm_private *priv = dev->dev_private;
struct drm_fb_helper *helper = priv->fbdev;
struct omap_fbdev *fbdev;
- struct fb_info *fbi;
DBG();
- fbi = helper->fbdev;
-
- /* only cleanup framebuffer if it is present */
- if (fbi) {
- unregister_framebuffer(fbi);
- framebuffer_release(fbi);
- }
+ drm_fb_helper_unregister_fbi(helper);
+ drm_fb_helper_release_fbi(helper);
drm_fb_helper_fini(helper);
--
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 ` Archit Taneja [this message]
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 ` [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-12-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=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=tomi.valkeinen@ti.com \
/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).