From: Lucas De Marchi <lucas.demarchi@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: "Tvrtko Ursulin" <tvrtko.ursulin@linux.intel.com>,
"Thomas Hellström" <thomas.hellstrom@linux.intel.com>,
"David Airlie" <airlied@linux.ie>,
dri-devel@lists.freedesktop.org,
"Matthew Auld" <matthew.auld@intel.com>
Subject: [PATCH 03/19] drm/i915/gt: Add helper for shmem copy to dma_buf_map
Date: Wed, 26 Jan 2022 12:36:46 -0800 [thread overview]
Message-ID: <20220126203702.1784589-4-lucas.demarchi@intel.com> (raw)
In-Reply-To: <20220126203702.1784589-1-lucas.demarchi@intel.com>
Add a variant of shmem_read() that takes a dma_buf_map pointer rather
than a plain pointer as argument. It's mostly a copy __shmem_rw() but
adapting the api and removing the write support since there's currently
only need to use dma_buf_map as destination.
Reworking __shmem_rw() to share the implementation was tempting, but
finding a good balance between reuse and clarity pushed towards a little
code duplication. Since the function is small, just add the similar
function with a copy/paste/adapt approach.
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Matthew Auld <matthew.auld@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
drivers/gpu/drm/i915/gt/shmem_utils.c | 32 +++++++++++++++++++++++++++
drivers/gpu/drm/i915/gt/shmem_utils.h | 3 +++
2 files changed, 35 insertions(+)
diff --git a/drivers/gpu/drm/i915/gt/shmem_utils.c b/drivers/gpu/drm/i915/gt/shmem_utils.c
index 0683b27a3890..d7968e68ccfb 100644
--- a/drivers/gpu/drm/i915/gt/shmem_utils.c
+++ b/drivers/gpu/drm/i915/gt/shmem_utils.c
@@ -3,6 +3,7 @@
* Copyright © 2020 Intel Corporation
*/
+#include <linux/dma-buf-map.h>
#include <linux/mm.h>
#include <linux/pagemap.h>
#include <linux/shmem_fs.h>
@@ -123,6 +124,37 @@ static int __shmem_rw(struct file *file, loff_t off,
return 0;
}
+int shmem_read_to_dma_buf_map(struct file *file, loff_t off,
+ struct dma_buf_map *map, size_t len)
+{
+ struct dma_buf_map map_iter = *map;
+ unsigned long pfn;
+
+ for (pfn = off >> PAGE_SHIFT; len; pfn++) {
+ unsigned int this =
+ min_t(size_t, PAGE_SIZE - offset_in_page(off), len);
+ struct page *page;
+ void *vaddr;
+
+ page = shmem_read_mapping_page_gfp(file->f_mapping, pfn,
+ GFP_KERNEL);
+ if (IS_ERR(page))
+ return PTR_ERR(page);
+
+ vaddr = kmap(page);
+ dma_buf_map_memcpy_to(&map_iter, vaddr + offset_in_page(off), this);
+ mark_page_accessed(page);
+ kunmap(page);
+ put_page(page);
+
+ len -= this;
+ dma_buf_map_incr(&map_iter, this);
+ off = 0;
+ }
+
+ return 0;
+}
+
int shmem_read(struct file *file, loff_t off, void *dst, size_t len)
{
return __shmem_rw(file, off, dst, len, false);
diff --git a/drivers/gpu/drm/i915/gt/shmem_utils.h b/drivers/gpu/drm/i915/gt/shmem_utils.h
index c1669170c351..a3d4ce966f74 100644
--- a/drivers/gpu/drm/i915/gt/shmem_utils.h
+++ b/drivers/gpu/drm/i915/gt/shmem_utils.h
@@ -8,6 +8,7 @@
#include <linux/types.h>
+struct dma_buf_map;
struct drm_i915_gem_object;
struct file;
@@ -17,6 +18,8 @@ struct file *shmem_create_from_object(struct drm_i915_gem_object *obj);
void *shmem_pin_map(struct file *file);
void shmem_unpin_map(struct file *file, void *ptr);
+int shmem_read_to_dma_buf_map(struct file *file, loff_t off,
+ struct dma_buf_map *map, size_t len);
int shmem_read(struct file *file, loff_t off, void *dst, size_t len);
int shmem_write(struct file *file, loff_t off, void *src, size_t len);
--
2.35.0
next prev parent reply other threads:[~2022-01-26 20:36 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-26 20:36 [PATCH 00/19] drm/i915/guc: Refactor ADS access to use dma_buf_map Lucas De Marchi
2022-01-26 20:36 ` [PATCH 01/19] dma-buf-map: Add read/write helpers Lucas De Marchi
2022-01-27 7:24 ` Christian König
2022-01-27 7:36 ` Matthew Brost
2022-01-27 7:59 ` Christian König
2022-01-27 9:02 ` [Intel-gfx] " Daniel Vetter
2022-01-27 14:26 ` Thomas Zimmermann
2022-01-27 16:34 ` Lucas De Marchi
2022-01-28 8:32 ` Thomas Zimmermann
2022-01-26 20:36 ` [PATCH 02/19] dma-buf-map: Add helper to initialize second map Lucas De Marchi
2022-01-27 7:27 ` Christian König
2022-01-27 7:57 ` Lucas De Marchi
2022-01-27 8:02 ` Christian König
2022-01-27 8:18 ` [Intel-gfx] " Lucas De Marchi
2022-01-27 8:55 ` Christian König
2022-01-27 9:12 ` Lucas De Marchi
2022-01-27 9:21 ` Christian König
2022-01-27 8:57 ` Daniel Vetter
2022-01-27 9:33 ` [Intel-gfx] " Lucas De Marchi
2022-01-27 10:00 ` Daniel Vetter
2022-01-27 10:21 ` Christian König
2022-01-27 11:16 ` Daniel Vetter
2022-01-27 11:44 ` [Linaro-mm-sig] " Christian König
2022-01-27 11:56 ` Daniel Vetter
2022-01-27 16:13 ` Lucas De Marchi
2022-01-27 14:52 ` Thomas Zimmermann
2022-01-27 16:12 ` Lucas De Marchi
2022-01-27 14:33 ` Thomas Zimmermann
2022-01-27 15:59 ` [Intel-gfx] " Lucas De Marchi
2022-01-28 8:15 ` Thomas Zimmermann
2022-01-28 8:34 ` Thomas Zimmermann
2022-01-26 20:36 ` Lucas De Marchi [this message]
2022-01-26 20:36 ` [PATCH 04/19] drm/i915/guc: Keep dma_buf_map of ads_blob around Lucas De Marchi
2022-01-26 20:36 ` [PATCH 05/19] drm/i915/guc: Add read/write helpers for ADS blob Lucas De Marchi
2022-01-26 20:36 ` [PATCH 06/19] drm/i915/guc: Convert golden context init to dma_buf_map Lucas De Marchi
2022-01-26 20:36 ` [PATCH 07/19] drm/i915/guc: Convert policies update " Lucas De Marchi
2022-01-26 20:36 ` [PATCH 08/19] drm/i915/guc: Convert engine record " Lucas De Marchi
2022-01-26 20:36 ` [PATCH 09/19] dma-buf-map: Add wrapper over memset Lucas De Marchi
2022-01-27 7:28 ` Christian König
2022-01-27 14:54 ` Thomas Zimmermann
2022-01-27 15:38 ` [Intel-gfx] " Lucas De Marchi
2022-01-27 15:47 ` Thomas Zimmermann
2022-01-26 20:36 ` [PATCH 10/19] drm/i915/guc: Convert guc_ads_private_data_reset to dma_buf_map Lucas De Marchi
2022-01-26 20:36 ` [PATCH 11/19] drm/i915/guc: Convert golden context prep " Lucas De Marchi
2022-01-26 20:36 ` [PATCH 12/19] drm/i915/guc: Replace check for golden context size Lucas De Marchi
2022-01-26 20:36 ` [PATCH 13/19] drm/i915/guc: Convert mapping table to dma_buf_map Lucas De Marchi
2022-01-26 20:36 ` [PATCH 14/19] drm/i915/guc: Convert capture list " Lucas De Marchi
2022-01-26 20:36 ` [PATCH 15/19] drm/i915/guc: Prepare for error propagation Lucas De Marchi
2022-01-26 20:36 ` [PATCH 16/19] drm/i915/guc: Use a single pass to calculate regset Lucas De Marchi
2022-01-27 0:29 ` kernel test robot
2022-01-27 2:02 ` kernel test robot
2022-01-27 4:37 ` kernel test robot
2022-02-01 22:42 ` Daniele Ceraolo Spurio
2022-02-03 23:44 ` Lucas De Marchi
2022-01-26 20:37 ` [PATCH 17/19] drm/i915/guc: Convert guc_mmio_reg_state_init to dma_buf_map Lucas De Marchi
2022-01-26 20:37 ` [PATCH 18/19] drm/i915/guc: Convert __guc_ads_init " Lucas De Marchi
2022-01-26 20:37 ` [PATCH 19/19] drm/i915/guc: Remove plain ads_blob pointer Lucas De Marchi
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=20220126203702.1784589-4-lucas.demarchi@intel.com \
--to=lucas.demarchi@intel.com \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=matthew.auld@intel.com \
--cc=thomas.hellstrom@linux.intel.com \
--cc=tvrtko.ursulin@linux.intel.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