From: Archit Taneja <architt@codeaurora.org>
To: dri-devel@lists.freedesktop.org, daniel@ffwll.ch
Cc: linux-arm-msm@vger.kernel.org
Subject: [PATCH 24/25] drm/virtio: Use new drm_fb_helper functions
Date: Mon, 13 Jul 2015 12:08:20 +0530 [thread overview]
Message-ID: <1436769501-4105-25-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: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Archit Taneja <architt@codeaurora.org>
---
drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 3 ++-
drivers/gpu/drm/virtio/virtgpu_fb.c | 30 +++++++++---------------------
2 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/drivers/gpu/drm/virtio/virtgpu_drm_bus.c b/drivers/gpu/drm/virtio/virtgpu_drm_bus.c
index 88a3916..aea1bac 100644
--- a/drivers/gpu/drm/virtio/virtgpu_drm_bus.c
+++ b/drivers/gpu/drm/virtio/virtgpu_drm_bus.c
@@ -52,7 +52,8 @@ static void virtio_pci_kick_out_firmware_fb(struct pci_dev *pci_dev)
primary = pci_dev->resource[PCI_ROM_RESOURCE].flags
& IORESOURCE_ROM_SHADOW;
- remove_conflicting_framebuffers(ap, "virtiodrmfb", primary);
+ drm_fb_helper_remove_conflicting_framebuffers(ap, "virtiodrmfb",
+ primary);
kfree(ap);
}
diff --git a/drivers/gpu/drm/virtio/virtgpu_fb.c b/drivers/gpu/drm/virtio/virtgpu_fb.c
index df198d9..3b5462b 100644
--- a/drivers/gpu/drm/virtio/virtgpu_fb.c
+++ b/drivers/gpu/drm/virtio/virtgpu_fb.c
@@ -173,7 +173,7 @@ static void virtio_gpu_3d_fillrect(struct fb_info *info,
const struct fb_fillrect *rect)
{
struct virtio_gpu_fbdev *vfbdev = info->par;
- sys_fillrect(info, rect);
+ drm_fb_helper_sys_fillrect(info, rect);
virtio_gpu_dirty_update(&vfbdev->vgfb, true, rect->dx, rect->dy,
rect->width, rect->height);
schedule_delayed_work(&vfbdev->work, VIRTIO_GPU_FBCON_POLL_PERIOD);
@@ -183,7 +183,7 @@ static void virtio_gpu_3d_copyarea(struct fb_info *info,
const struct fb_copyarea *area)
{
struct virtio_gpu_fbdev *vfbdev = info->par;
- sys_copyarea(info, area);
+ drm_fb_helper_sys_copyarea(info, area);
virtio_gpu_dirty_update(&vfbdev->vgfb, true, area->dx, area->dy,
area->width, area->height);
schedule_delayed_work(&vfbdev->work, VIRTIO_GPU_FBCON_POLL_PERIOD);
@@ -193,7 +193,7 @@ static void virtio_gpu_3d_imageblit(struct fb_info *info,
const struct fb_image *image)
{
struct virtio_gpu_fbdev *vfbdev = info->par;
- sys_imageblit(info, image);
+ drm_fb_helper_sys_imageblit(info, image);
virtio_gpu_dirty_update(&vfbdev->vgfb, true, image->dx, image->dy,
image->width, image->height);
schedule_delayed_work(&vfbdev->work, VIRTIO_GPU_FBCON_POLL_PERIOD);
@@ -317,18 +317,12 @@ static int virtio_gpufb_create(struct drm_fb_helper *helper,
if (ret)
goto err_obj_attach;
- 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 err_fb_alloc;
}
- ret = fb_alloc_cmap(&info->cmap, 256, 0);
- if (ret) {
- ret = -ENOMEM;
- goto err_fb_alloc_cmap;
- }
-
info->par = helper;
ret = virtio_gpu_framebuffer_init(dev, &vfbdev->vgfb,
@@ -339,7 +333,6 @@ static int virtio_gpufb_create(struct drm_fb_helper *helper,
fb = &vfbdev->vgfb.base;
vfbdev->helper.fb = fb;
- vfbdev->helper.fbdev = info;
strcpy(info->fix.id, "virtiodrmfb");
info->flags = FBINFO_DEFAULT;
@@ -357,9 +350,7 @@ static int virtio_gpufb_create(struct drm_fb_helper *helper,
return 0;
err_fb_init:
- fb_dealloc_cmap(&info->cmap);
-err_fb_alloc_cmap:
- framebuffer_release(info);
+ drm_fb_helper_release_fbi(helper);
err_fb_alloc:
virtio_gpu_cmd_resource_inval_backing(vgdev, resid);
err_obj_attach:
@@ -374,12 +365,9 @@ static int virtio_gpu_fbdev_destroy(struct drm_device *dev,
struct fb_info *info;
struct virtio_gpu_framebuffer *vgfb = &vgfbdev->vgfb;
- if (vgfbdev->helper.fbdev) {
- info = vgfbdev->helper.fbdev;
+ drm_fb_helper_unregister_fbi(&vgfbdev->helper);
+ drm_fb_helper_release_fbi(&vgfbdev->helper);
- unregister_framebuffer(info);
- framebuffer_release(info);
- }
if (vgfb->obj)
vgfb->obj = NULL;
drm_fb_helper_fini(&vgfbdev->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
next prev parent reply other threads:[~2015-07-13 6:40 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 ` Archit Taneja [this message]
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-25-git-send-email-architt@codeaurora.org \
--to=architt@codeaurora.org \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-arm-msm@vger.kernel.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).