From: Rob Herring <robh@kernel.org>
To: dri-devel@lists.freedesktop.org
Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>,
Maxime Ripard <maxime.ripard@bootlin.com>,
Sean Paul <sean@poorly.run>, Steven Price <steven.price@arm.com>,
David Airlie <airlied@linux.ie>,
Boris Brezillon <boris.brezillon@collabora.com>,
Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>,
Robin Murphy <robin.murphy@arm.com>
Subject: [PATCH v3 2/8] drm/shmem: Put pages independent of a SG table being set
Date: Fri, 2 Aug 2019 13:51:44 -0600 [thread overview]
Message-ID: <20190802195150.23207-3-robh@kernel.org> (raw)
In-Reply-To: <20190802195150.23207-1-robh@kernel.org>
If a driver does its own management of pages, the shmem helper object's
pages array could be allocated when a SG table is not. There's not
really any good reason to tie putting pages with having a SG table when
freeing the object, so just put pages if the pages array is populated.
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <maxime.ripard@bootlin.com>
Cc: Sean Paul <sean@poorly.run>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Eric Anholt <eric@anholt.net>
Reviewed-by: Steven Price <steven.price@arm.com>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Signed-off-by: Rob Herring <robh@kernel.org>
---
drivers/gpu/drm/drm_gem_shmem_helper.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
index 2f64667ac805..477e4cc50f7a 100644
--- a/drivers/gpu/drm/drm_gem_shmem_helper.c
+++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
@@ -118,11 +118,11 @@ void drm_gem_shmem_free_object(struct drm_gem_object *obj)
if (shmem->sgt) {
dma_unmap_sg(obj->dev->dev, shmem->sgt->sgl,
shmem->sgt->nents, DMA_BIDIRECTIONAL);
-
- drm_gem_shmem_put_pages(shmem);
sg_free_table(shmem->sgt);
kfree(shmem->sgt);
}
+ if (shmem->pages)
+ drm_gem_shmem_put_pages(shmem);
}
WARN_ON(shmem->pages_use_count);
--
2.20.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2019-08-02 19:51 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-02 19:51 [PATCH v3 0/8] drm/panfrost: Add heap and no execute buffer allocation Rob Herring
2019-08-02 19:51 ` [PATCH v3 1/8] drm/gem: Allow sparsely populated page arrays in drm_gem_put_pages Rob Herring
2019-08-02 19:51 ` Rob Herring [this message]
2019-08-02 19:51 ` [PATCH v3 3/8] drm/panfrost: Restructure the GEM object creation Rob Herring
2019-08-02 19:51 ` [PATCH v3 4/8] drm/panfrost: Split panfrost_mmu_map SG list mapping to its own function Rob Herring
2019-08-08 12:57 ` Steven Price
2019-08-02 19:51 ` [PATCH v3 5/8] drm/panfrost: Add a no execute flag for BO allocations Rob Herring
2019-08-02 19:51 ` [PATCH v3 6/8] drm/panfrost: Convert MMU IRQ handler to threaded handler Rob Herring
2019-08-02 22:28 ` Alyssa Rosenzweig
2019-08-08 12:57 ` Steven Price
2019-08-02 19:51 ` [PATCH v3 7/8] drm/panfrost: Add support for GPU heap allocations Rob Herring
2019-08-08 13:37 ` Steven Price
2019-08-02 19:51 ` [PATCH v3 8/8] drm/panfrost: Bump driver version to 1.1 Rob Herring
2019-08-05 16:09 ` [PATCH v3 0/8] drm/panfrost: Add heap and no execute buffer allocation Tomeu Vizoso
2019-08-05 21:10 ` Rob Herring
2019-08-06 5:23 ` Tomeu Vizoso
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=20190802195150.23207-3-robh@kernel.org \
--to=robh@kernel.org \
--cc=airlied@linux.ie \
--cc=alyssa.rosenzweig@collabora.com \
--cc=boris.brezillon@collabora.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=maxime.ripard@bootlin.com \
--cc=robin.murphy@arm.com \
--cc=sean@poorly.run \
--cc=steven.price@arm.com \
--cc=tomeu.vizoso@collabora.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).