From: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
To: tomba@kernel.org, airlied@linux.ie, daniel@ffwll.ch
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
linux-omap@vger.kernel.org, merlijn@wizzup.org, tony@atomide.com,
Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
Subject: [PATCH 1/3] drm: omapdrm: simplify omap_gem_pin
Date: Wed, 19 Jan 2022 12:23:09 +0200 [thread overview]
Message-ID: <1642587791-13222-2-git-send-email-ivo.g.dimitrov.75@gmail.com> (raw)
In-Reply-To: <1642587791-13222-1-git-send-email-ivo.g.dimitrov.75@gmail.com>
Move tiler related code to its own function.
Signed-off-by: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
---
drivers/gpu/drm/omapdrm/omap_gem.c | 75 +++++++++++++++++++++-----------------
1 file changed, 42 insertions(+), 33 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c
index b0fa174..bb12cb4 100644
--- a/drivers/gpu/drm/omapdrm/omap_gem.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem.c
@@ -750,6 +750,46 @@ void omap_gem_dma_sync_buffer(struct drm_gem_object *obj,
}
}
+static int omap_gem_pin_tiler(struct drm_gem_object *obj)
+{
+ struct omap_gem_object *omap_obj = to_omap_bo(obj);
+ u32 npages = obj->size >> PAGE_SHIFT;
+ enum tiler_fmt fmt = gem2fmt(omap_obj->flags);
+ struct tiler_block *block;
+ int ret;
+
+ BUG_ON(omap_obj->block);
+
+ if (omap_obj->flags & OMAP_BO_TILED_MASK) {
+ block = tiler_reserve_2d(fmt, omap_obj->width, omap_obj->height,
+ PAGE_SIZE);
+ } else {
+ block = tiler_reserve_1d(obj->size);
+ }
+
+ if (IS_ERR(block)) {
+ ret = PTR_ERR(block);
+ dev_err(obj->dev->dev, "could not remap: %d (%d)\n", ret, fmt);
+ goto fail;
+ }
+
+ /* TODO: enable async refill.. */
+ ret = tiler_pin(block, omap_obj->pages, npages, omap_obj->roll, true);
+ if (ret) {
+ tiler_release(block);
+ dev_err(obj->dev->dev, "could not pin: %d\n", ret);
+ goto fail;
+ }
+
+ omap_obj->dma_addr = tiler_ssptr(block);
+ omap_obj->block = block;
+
+ DBG("got dma address: %pad", &omap_obj->dma_addr);
+
+fail:
+ return ret;
+}
+
/**
* omap_gem_pin() - Pin a GEM object in memory
* @obj: the GEM object
@@ -774,11 +814,6 @@ int omap_gem_pin(struct drm_gem_object *obj, dma_addr_t *dma_addr)
if (!omap_gem_is_contiguous(omap_obj) && priv->has_dmm) {
if (refcount_read(&omap_obj->dma_addr_cnt) == 0) {
- u32 npages = obj->size >> PAGE_SHIFT;
- enum tiler_fmt fmt = gem2fmt(omap_obj->flags);
- struct tiler_block *block;
-
- BUG_ON(omap_obj->block);
refcount_set(&omap_obj->dma_addr_cnt, 1);
@@ -786,35 +821,9 @@ int omap_gem_pin(struct drm_gem_object *obj, dma_addr_t *dma_addr)
if (ret)
goto fail;
- if (omap_obj->flags & OMAP_BO_TILED_MASK) {
- block = tiler_reserve_2d(fmt,
- omap_obj->width,
- omap_obj->height, PAGE_SIZE);
- } else {
- block = tiler_reserve_1d(obj->size);
- }
-
- if (IS_ERR(block)) {
- ret = PTR_ERR(block);
- dev_err(obj->dev->dev,
- "could not remap: %d (%d)\n", ret, fmt);
- goto fail;
- }
-
- /* TODO: enable async refill.. */
- ret = tiler_pin(block, omap_obj->pages, npages,
- omap_obj->roll, true);
- if (ret) {
- tiler_release(block);
- dev_err(obj->dev->dev,
- "could not pin: %d\n", ret);
+ ret = omap_gem_pin_tiler(obj);
+ if (ret)
goto fail;
- }
-
- omap_obj->dma_addr = tiler_ssptr(block);
- omap_obj->block = block;
-
- DBG("got dma address: %pad", &omap_obj->dma_addr);
} else {
refcount_inc(&omap_obj->dma_addr_cnt);
}
--
1.9.1
next prev parent reply other threads:[~2022-01-19 10:23 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-19 10:23 [PATCH 0/3] drm: omapdrm: Fix excessive GEM buffers DMM/CMA usage Ivaylo Dimitrov
2022-01-19 10:23 ` Ivaylo Dimitrov [this message]
2022-01-19 10:23 ` [PATCH 2/3] drm: omapdrm: Support exporting of non-contiguous GEM BOs Ivaylo Dimitrov
2022-01-19 10:23 ` [PATCH 3/3] drm: omapdrm: Do no allocate non-scanout GEMs through DMM/TILER Ivaylo Dimitrov
2022-02-17 12:46 ` Tomi Valkeinen
2022-02-17 15:29 ` Ivaylo Dimitrov
2022-08-12 4:35 ` Yongqin Liu
2022-08-13 6:58 ` Ivaylo Dimitrov
2022-08-14 14:27 ` Yongqin Liu
2022-08-15 6:23 ` Ivaylo Dimitrov
2022-08-17 4:52 ` Yongqin Liu
2022-08-18 10:23 ` Ivaylo Dimitrov
2022-08-29 2:51 ` Yongqin Liu
2022-08-29 13:24 ` Ivaylo Dimitrov
2022-08-29 14:36 ` Andrew Davis
2022-08-30 15:08 ` Yongqin Liu
2022-08-30 18:08 ` Ivaylo Dimitrov
2022-08-30 18:23 ` Tomi Valkeinen
2022-09-02 14:13 ` Ivaylo Dimitrov
2022-10-30 22:08 ` H. Nikolaus Schaller
2022-10-31 7:05 ` Ivaylo Dimitrov
2022-10-31 7:44 ` H. Nikolaus Schaller
2022-10-31 7:57 ` H. Nikolaus Schaller
2022-10-31 9:58 ` Ivaylo Dimitrov
2022-10-31 10:07 ` H. Nikolaus Schaller
2022-10-31 10:13 ` Tony Lindgren
2022-10-31 10:30 ` Ivaylo Dimitrov
2022-10-31 11:14 ` Ivaylo Dimitrov
2022-02-14 7:08 ` [PATCH 0/3] drm: omapdrm: Fix excessive GEM buffers DMM/CMA usage Ivaylo Dimitrov
2022-02-16 8:10 ` Thomas Zimmermann
2022-02-17 13:03 ` Tomi Valkeinen
2022-02-17 16:21 ` Ivaylo Dimitrov
2022-03-08 8:51 ` Tomi Valkeinen
2022-03-28 9:46 ` Tomi Valkeinen
2022-03-28 15:30 ` Ivaylo Dimitrov
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=1642587791-13222-2-git-send-email-ivo.g.dimitrov.75@gmail.com \
--to=ivo.g.dimitrov.75@gmail.com \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=merlijn@wizzup.org \
--cc=tomba@kernel.org \
--cc=tony@atomide.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).