All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
	Daniel Vetter <daniel.vetter@intel.com>
Subject: [PATCH 11/13] drm/vgem: Move get_pages to gem_create
Date: Wed, 30 Mar 2016 11:40:50 +0200	[thread overview]
Message-ID: <1459330852-27668-12-git-send-email-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <1459330852-27668-1-git-send-email-daniel.vetter@ffwll.ch>

vgem doesn't have a shrinker or anything like that and drops backing
storage only at object_free time. There's no use in trying to be
clever and allocating backing storage delayed, it only causes trouble
by requiring locking.

Instead grab pages when we allocate the object right away.

v2: Fix compiling.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 drivers/gpu/drm/vgem/vgem_drv.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c
index f3ee1c41da1e..75f18987411a 100644
--- a/drivers/gpu/drm/vgem/vgem_drv.c
+++ b/drivers/gpu/drm/vgem/vgem_drv.c
@@ -154,6 +154,10 @@ static struct drm_gem_object *vgem_gem_create(struct drm_device *dev,
 	if (err)
 		goto out;
 
+	err = vgem_gem_get_pages(obj);
+	if (err)
+		goto out;
+
 	err = drm_gem_handle_create(file, gem_object, handle);
 	if (err)
 		goto handle_out;
@@ -216,16 +220,8 @@ int vgem_gem_dumb_map(struct drm_file *file, struct drm_device *dev,
 
 	obj->filp->private_data = obj;
 
-	ret = vgem_gem_get_pages(to_vgem_bo(obj));
-	if (ret)
-		goto fail_get_pages;
-
 	*offset = drm_vma_node_offset_addr(&obj->vma_node);
 
-	goto unref;
-
-fail_get_pages:
-	drm_gem_free_mmap_offset(obj);
 unref:
 	drm_gem_object_unreference(obj);
 unlock:
-- 
2.8.0.rc3

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

  parent reply	other threads:[~2016-03-30  9:41 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-30  9:40 [PATCH 00/13] Gem cleanup&fixes resend, once more Daniel Vetter
2016-03-30  9:40 ` [PATCH 01/13] drm/nouveau: Use unlocked gem unreferencing Daniel Vetter
2016-03-30  9:40 ` [PATCH 02/13] drm/omapdrm: " Daniel Vetter
2016-04-18 16:15   ` Tomi Valkeinen
2016-04-20 10:55     ` Daniel Vetter
2016-04-20 13:52   ` Laurent Pinchart
2016-03-30  9:40 ` [PATCH 03/13] drm/qxl: " Daniel Vetter
2016-03-30  9:40 ` [PATCH 04/13] drm/udl: " Daniel Vetter
2016-03-30 10:55   ` poma
2016-03-30  9:40 ` [PATCH 05/13] drm/nouveau: Drop dev->struct_mutex from fbdev init Daniel Vetter
2016-03-30  9:40 ` [PATCH 06/13] drm/exynos: Drop dev->struct_mutex from mmap offset function Daniel Vetter
2016-03-30  9:40 ` [PATCH 07/13] drm/exynos: drop struct_mutex from exynos_gem_map_sgt_with_dma Daniel Vetter
2016-03-30 10:23   ` Emil Velikov
2016-03-30  9:40 ` [PATCH 08/13] drm/exynos: drop struct_mutex from exynos_drm_gem_get_ioctl Daniel Vetter
2016-03-30  9:40 ` [PATCH 09/13] drm/exynos: drop struct_mutex from fbdev setup Daniel Vetter
2016-03-30  9:40 ` [PATCH 10/13] drm/vgem: Simplify dum_map Daniel Vetter
2016-03-30 10:29   ` Emil Velikov
2016-03-30 10:31     ` Daniel Stone
2016-03-30  9:40 ` Daniel Vetter [this message]
2016-03-30  9:40 ` [PATCH 12/13] drm/vgem: Drop dev->struct_mutex Daniel Vetter
2016-03-30  9:40 ` [PATCH 13/13] drm/vma_manage: Drop has_offset Daniel Vetter

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=1459330852-27668-12-git-send-email-daniel.vetter@ffwll.ch \
    --to=daniel.vetter@ffwll.ch \
    --cc=daniel.vetter@intel.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.