From: Rob Clark <robdclark@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org,
Connor Abbott <cwabbott0@gmail.com>,
Akhil P Oommen <quic_akhilpo@quicinc.com>,
Rob Clark <robdclark@chromium.org>,
Rob Clark <robdclark@gmail.com>,
Abhinav Kumar <quic_abhinavk@quicinc.com>,
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
Sean Paul <sean@poorly.run>,
Marijn Suijten <marijn.suijten@somainline.org>,
David Airlie <airlied@gmail.com>, Simona Vetter <simona@ffwll.ch>,
linux-kernel@vger.kernel.org (open list)
Subject: [RFC 19/24] drm/msm: Split out helper to get iommu prot flags
Date: Sat, 7 Dec 2024 08:15:19 -0800 [thread overview]
Message-ID: <20241207161651.410556-20-robdclark@gmail.com> (raw)
In-Reply-To: <20241207161651.410556-1-robdclark@gmail.com>
From: Rob Clark <robdclark@chromium.org>
We'll re-use this in the vm_bind path.
Signed-off-by: Rob Clark <robdclark@chromium.org>
---
drivers/gpu/drm/msm/msm_gem.c | 12 ++++++++++--
drivers/gpu/drm/msm/msm_gem.h | 1 +
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c
index c21e1284f289..7cc4b8955687 100644
--- a/drivers/gpu/drm/msm/msm_gem.c
+++ b/drivers/gpu/drm/msm/msm_gem.c
@@ -443,10 +443,9 @@ static struct drm_gpuva *get_vma_locked(struct drm_gem_object *obj,
return vma;
}
-int msm_gem_pin_vma_locked(struct drm_gem_object *obj, struct drm_gpuva *vma)
+int msm_gem_prot(struct drm_gem_object *obj)
{
struct msm_gem_object *msm_obj = to_msm_bo(obj);
- struct page **pages;
int prot = IOMMU_READ;
if (!(msm_obj->flags & MSM_BO_GPU_READONLY))
@@ -458,6 +457,15 @@ int msm_gem_pin_vma_locked(struct drm_gem_object *obj, struct drm_gpuva *vma)
if (msm_obj->flags & MSM_BO_CACHED_COHERENT)
prot |= IOMMU_CACHE;
+ return prot;
+}
+
+int msm_gem_pin_vma_locked(struct drm_gem_object *obj, struct drm_gpuva *vma)
+{
+ struct msm_gem_object *msm_obj = to_msm_bo(obj);
+ struct page **pages;
+ int prot = msm_gem_prot(obj);
+
msm_gem_assert_locked(obj);
pages = msm_gem_get_pages_locked(obj, MSM_MADV_WILLNEED);
diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h
index a2255fd269ca..a00149d66d37 100644
--- a/drivers/gpu/drm/msm/msm_gem.h
+++ b/drivers/gpu/drm/msm/msm_gem.h
@@ -188,6 +188,7 @@ struct msm_gem_object {
#define to_msm_bo(x) container_of(x, struct msm_gem_object, base)
uint64_t msm_gem_mmap_offset(struct drm_gem_object *obj);
+int msm_gem_prot(struct drm_gem_object *obj);
int msm_gem_pin_vma_locked(struct drm_gem_object *obj, struct drm_gpuva *vma);
void msm_gem_unpin_locked(struct drm_gem_object *obj);
void msm_gem_unpin_active(struct drm_gem_object *obj);
--
2.47.1
next prev parent reply other threads:[~2024-12-07 16:18 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-07 16:15 [RFC 00/24] drm/msm: sparse / "VM_BIND" support Rob Clark
2024-12-07 16:15 ` [RFC 01/24] HACK: drm/msm: Disable shrinker Rob Clark
2024-12-07 16:15 ` [RFC 02/24] drm/gpuvm: Don't require obj lock in destructor path Rob Clark
2024-12-07 16:15 ` [RFC 03/24] drm/gpuvm: Remove bogus lock assert Rob Clark
2024-12-07 16:15 ` [RFC 04/24] drm/msm: Rename msm_file_private -> msm_context Rob Clark
2024-12-07 16:15 ` [RFC 05/24] drm/msm: Improve msm_context comments Rob Clark
2024-12-07 16:15 ` [RFC 06/24] drm/msm: Rename msm_gem_address_space -> msm_gem_vm Rob Clark
2024-12-07 16:15 ` [RFC 07/24] drm/msm: Remove vram carveout support Rob Clark
2024-12-07 16:15 ` [RFC 08/24] drm/msm: Collapse vma allocation and initialization Rob Clark
2024-12-07 16:15 ` [RFC 09/24] drm/msm: Collapse vma close and delete Rob Clark
2024-12-07 16:15 ` [RFC 10/24] drm/msm: drm_gpuvm conversion Rob Clark
2024-12-07 16:15 ` [RFC 11/24] drm/msm: Use drm_gpuvm types more Rob Clark
2024-12-07 16:15 ` [RFC 12/24] drm/msm: Split submit_pin_objects() Rob Clark
2024-12-07 16:15 ` [RFC 13/24] drm/msm: Lazily create context VM Rob Clark
2024-12-07 16:15 ` [RFC 14/24] drm/msm: Add opt-in for VM_BIND Rob Clark
2024-12-07 16:15 ` [RFC 15/24] drm/msm: Mark VM as unusable on faults Rob Clark
2024-12-07 16:15 ` [RFC 16/24] drm/msm: Extend SUBMIT ioctl for VM_BIND Rob Clark
2024-12-07 16:15 ` [RFC 17/24] drm/msm: Add VM_BIND submitqueue Rob Clark
2024-12-07 16:15 ` [RFC 18/24] drm/msm: Add _NO_SHARE flag Rob Clark
2024-12-07 16:15 ` Rob Clark [this message]
2024-12-07 16:15 ` [RFC 20/24] drm/msm: Add mmu support for non-zero offset Rob Clark
2024-12-07 16:15 ` [RFC 21/24] drm/msm: Add PRR support Rob Clark
2024-12-07 16:15 ` [RFC 22/24] drm/msm: Rename msm_gem_vma_purge() -> _unmap() Rob Clark
2024-12-07 16:15 ` [RFC 23/24] drm/msm: Wire up gpuvm ops Rob Clark
2024-12-07 16:15 ` [RFC 24/24] drm/msm: Bump UAPI version Rob Clark
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=20241207161651.410556-20-robdclark@gmail.com \
--to=robdclark@gmail.com \
--cc=airlied@gmail.com \
--cc=cwabbott0@gmail.com \
--cc=dmitry.baryshkov@linaro.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marijn.suijten@somainline.org \
--cc=quic_abhinavk@quicinc.com \
--cc=quic_akhilpo@quicinc.com \
--cc=robdclark@chromium.org \
--cc=sean@poorly.run \
--cc=simona@ffwll.ch \
/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