dri-devel Archive on lore.kernel.org
 help / color / Atom feed
From: Archit Taneja <architt@codeaurora.org>
To: dri-devel@lists.freedesktop.org, daniel@ffwll.ch
Subject: [PATCH v2 13/25] drm/msm: Use new drm_fb_helper functions
Date: Wed, 22 Jul 2015 12:29:49 +0530
Message-ID: <1437548401-10125-14-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.

Cc: Rob Clark <robdclark@gmail.com>
Cc: Stephane Viau <sviau@codeaurora.org>
Cc: Hai Li <hali@codeaurora.org>

Signed-off-by: Archit Taneja <architt@codeaurora.org>
---
 drivers/gpu/drm/msm/msm_fbdev.c | 34 ++++++++++------------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbdev.c
index 95f6532..f97a196 100644
--- a/drivers/gpu/drm/msm/msm_fbdev.c
+++ b/drivers/gpu/drm/msm/msm_fbdev.c
@@ -43,11 +43,11 @@ static struct fb_ops msm_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_mmap = msm_fbdev_mmap,
 
 	.fb_check_var = drm_fb_helper_check_var,
@@ -144,10 +144,10 @@ static int msm_fbdev_create(struct drm_fb_helper *helper,
 		goto fail_unlock;
 	}
 
-	fbi = framebuffer_alloc(0, dev->dev);
-	if (!fbi) {
+	fbi = drm_fb_helper_alloc_fbi(helper);
+	if (IS_ERR(fbi)) {
 		dev_err(dev->dev, "failed to allocate fb info\n");
-		ret = -ENOMEM;
+		ret = PTR_ERR(fbi);
 		goto fail_unlock;
 	}
 
@@ -155,7 +155,6 @@ static int msm_fbdev_create(struct drm_fb_helper *helper,
 
 	fbdev->fb = fb;
 	helper->fb = fb;
-	helper->fbdev = fbi;
 
 	fbi->par = helper;
 	fbi->flags = FBINFO_DEFAULT;
@@ -163,12 +162,6 @@ static int msm_fbdev_create(struct drm_fb_helper *helper,
 
 	strcpy(fbi->fix.id, "msm");
 
-	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);
 
@@ -191,7 +184,6 @@ fail_unlock:
 fail:
 
 	if (ret) {
-		framebuffer_release(fbi);
 		if (fb) {
 			drm_framebuffer_unregister_private(fb);
 			drm_framebuffer_remove(fb);
@@ -266,17 +258,11 @@ void msm_fbdev_free(struct drm_device *dev)
 	struct msm_drm_private *priv = dev->dev_private;
 	struct drm_fb_helper *helper = priv->fbdev;
 	struct msm_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

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply index

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   ` Archit Taneja [this message]
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=1437548401-10125-14-git-send-email-architt@codeaurora.org \
    --to=architt@codeaurora.org \
    --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

dri-devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/dri-devel/0 dri-devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dri-devel dri-devel/ https://lore.kernel.org/dri-devel \
		dri-devel@lists.freedesktop.org
	public-inbox-index dri-devel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.freedesktop.lists.dri-devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git