From: Mikko Perttunen <mperttunen@nvidia.com>
To: thierry.reding@gmail.com, jonathanh@nvidia.com, digetx@gmail.com,
airlied@linux.ie, daniel@ffwll.ch
Cc: linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org,
Mikko Perttunen <mperttunen@nvidia.com>
Subject: [PATCH v6 05/14] drm/tegra: Extract tegra_gem_lookup
Date: Sun, 30 May 2021 15:21:47 +0300 [thread overview]
Message-ID: <20210530122156.3292479-6-mperttunen@nvidia.com> (raw)
In-Reply-To: <20210530122156.3292479-1-mperttunen@nvidia.com>
The static function host1x_bo_lookup in drm.c is also useful
elsewhere. Extract it as tegra_gem_lookup in gem.c.
Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
---
v6:
- New patch
---
drivers/gpu/drm/tegra/drm.c | 20 +++-----------------
drivers/gpu/drm/tegra/gem.c | 13 +++++++++++++
drivers/gpu/drm/tegra/gem.h | 2 ++
3 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index 992aa5cde510..c9a35c1dc970 100644
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -106,20 +106,6 @@ static void tegra_drm_context_free(struct tegra_drm_context *context)
kfree(context);
}
-static struct host1x_bo *
-host1x_bo_lookup(struct drm_file *file, u32 handle)
-{
- struct drm_gem_object *gem;
- struct tegra_bo *bo;
-
- gem = drm_gem_object_lookup(file, handle);
- if (!gem)
- return NULL;
-
- bo = to_tegra_bo(gem);
- return &bo->base;
-}
-
static int host1x_reloc_copy_from_user(struct host1x_reloc *dest,
struct drm_tegra_reloc __user *src,
struct drm_device *drm,
@@ -150,11 +136,11 @@ static int host1x_reloc_copy_from_user(struct host1x_reloc *dest,
dest->flags = HOST1X_RELOC_READ | HOST1X_RELOC_WRITE;
- dest->cmdbuf.bo = host1x_bo_lookup(file, cmdbuf);
+ dest->cmdbuf.bo = tegra_gem_lookup(file, cmdbuf);
if (!dest->cmdbuf.bo)
return -ENOENT;
- dest->target.bo = host1x_bo_lookup(file, target);
+ dest->target.bo = tegra_gem_lookup(file, target);
if (!dest->target.bo)
return -ENOENT;
@@ -237,7 +223,7 @@ int tegra_drm_submit(struct tegra_drm_context *context,
goto fail;
}
- bo = host1x_bo_lookup(file, cmdbuf.handle);
+ bo = tegra_gem_lookup(file, cmdbuf.handle);
if (!bo) {
err = -ENOENT;
goto fail;
diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
index 26af8daa9a16..6ec598f5d5b3 100644
--- a/drivers/gpu/drm/tegra/gem.c
+++ b/drivers/gpu/drm/tegra/gem.c
@@ -707,3 +707,16 @@ struct drm_gem_object *tegra_gem_prime_import(struct drm_device *drm,
return &bo->gem;
}
+
+struct host1x_bo *tegra_gem_lookup(struct drm_file *file, u32 handle)
+{
+ struct drm_gem_object *gem;
+ struct tegra_bo *bo;
+
+ gem = drm_gem_object_lookup(file, handle);
+ if (!gem)
+ return NULL;
+
+ bo = to_tegra_bo(gem);
+ return &bo->base;
+}
diff --git a/drivers/gpu/drm/tegra/gem.h b/drivers/gpu/drm/tegra/gem.h
index fafb5724499b..2752c66e129c 100644
--- a/drivers/gpu/drm/tegra/gem.h
+++ b/drivers/gpu/drm/tegra/gem.h
@@ -74,4 +74,6 @@ struct dma_buf *tegra_gem_prime_export(struct drm_gem_object *gem,
struct drm_gem_object *tegra_gem_prime_import(struct drm_device *drm,
struct dma_buf *buf);
+struct host1x_bo *tegra_gem_lookup(struct drm_file *file, u32 handle);
+
#endif
--
2.30.1
next prev parent reply other threads:[~2021-05-30 12:50 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-30 12:21 [PATCH v6 00/14] TegraDRM UAPI Mikko Perttunen
2021-05-30 12:21 ` [PATCH v6 01/14] gpu: host1x: Add DMA fence implementation Mikko Perttunen
2021-05-30 13:45 ` kernel test robot
2021-05-30 12:21 ` [PATCH v6 02/14] gpu: host1x: Add no-recovery mode Mikko Perttunen
2021-05-30 12:21 ` [PATCH v6 03/14] gpu: host1x: Add job release callback Mikko Perttunen
2021-05-30 12:21 ` [PATCH v6 04/14] gpu: host1x: Add support for syncpoint waits in CDMA pushbuffer Mikko Perttunen
2021-05-30 12:21 ` Mikko Perttunen [this message]
2021-05-30 12:21 ` [PATCH v6 06/14] drm/tegra: Add new UAPI to header Mikko Perttunen
2021-05-30 12:21 ` [PATCH v6 07/14] drm/tegra: Boot VIC during runtime PM resume Mikko Perttunen
2021-05-30 12:21 ` [PATCH v6 08/14] drm/tegra: Allocate per-engine channel in core code Mikko Perttunen
2021-05-30 12:21 ` [PATCH v6 09/14] drm/tegra: Implement new UAPI Mikko Perttunen
2021-05-30 12:21 ` [PATCH v6 10/14] drm/tegra: Implement syncpoint management UAPI Mikko Perttunen
2021-05-30 12:21 ` [PATCH v6 11/14] drm/tegra: Implement syncpoint wait UAPI Mikko Perttunen
2021-05-30 12:21 ` [PATCH v6 12/14] drm/tegra: Implement job submission part of new UAPI Mikko Perttunen
2021-05-30 12:21 ` [PATCH v6 13/14] drm/tegra: Add job firewall Mikko Perttunen
2021-05-30 12:21 ` [PATCH v6 14/14] drm/tegra: Bump driver version Mikko Perttunen
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=20210530122156.3292479-6-mperttunen@nvidia.com \
--to=mperttunen@nvidia.com \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=digetx@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jonathanh@nvidia.com \
--cc=linux-tegra@vger.kernel.org \
--cc=thierry.reding@gmail.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