From: Matthew Auld <matthew.auld@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>,
dri-devel@lists.freedesktop.org,
"Nirmoy Das" <nirmoy.das@intel.com>
Subject: [PATCH v3 02/15] drm/i915/ttm: require mappable by default
Date: Fri, 11 Feb 2022 11:34:24 +0000 [thread overview]
Message-ID: <20220211113437.874691-3-matthew.auld@intel.com> (raw)
In-Reply-To: <20220211113437.874691-1-matthew.auld@intel.com>
On devices with non-mappable LMEM ensure we always allocate the pages
within the mappable portion. For now we assume that all LMEM buffers
will require CPU access, which is also inline with pretty much all
current kernel internal users. In the next patch we will introduce a new
flag to override this behaviour.
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Acked-by: Nirmoy Das <nirmoy.das@intel.com>
---
drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 4 ++++
drivers/gpu/drm/i915/intel_region_ttm.c | 5 +++++
2 files changed, 9 insertions(+)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
index e9399f7b3e67..41e94d09e742 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
@@ -128,6 +128,10 @@ i915_ttm_place_from_region(const struct intel_memory_region *mr,
if (flags & I915_BO_ALLOC_CONTIGUOUS)
place->flags = TTM_PL_FLAG_CONTIGUOUS;
+ if (mr->io_size && mr->io_size < mr->total) {
+ place->fpfn = 0;
+ place->lpfn = mr->io_size >> PAGE_SHIFT;
+ }
}
static void
diff --git a/drivers/gpu/drm/i915/intel_region_ttm.c b/drivers/gpu/drm/i915/intel_region_ttm.c
index f2b888c16958..4689192d5e8d 100644
--- a/drivers/gpu/drm/i915/intel_region_ttm.c
+++ b/drivers/gpu/drm/i915/intel_region_ttm.c
@@ -199,6 +199,11 @@ intel_region_ttm_resource_alloc(struct intel_memory_region *mem,
struct ttm_resource *res;
int ret;
+ if (mem->io_size && mem->io_size < mem->total) {
+ place.fpfn = 0;
+ place.lpfn = mem->io_size >> PAGE_SHIFT;
+ }
+
mock_bo.base.size = size;
place.flags = flags;
--
2.34.1
next prev parent reply other threads:[~2022-02-11 11:35 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-11 11:34 [PATCH v3 00/15] Initial support for small BAR recovery Matthew Auld
2022-02-11 11:34 ` [PATCH v3 01/15] drm/i915: add io_size plumbing Matthew Auld
2022-02-11 11:34 ` Matthew Auld [this message]
2022-02-11 11:34 ` [PATCH v3 03/15] drm/i915: add I915_BO_ALLOC_GPU_ONLY Matthew Auld
2022-02-11 11:34 ` [PATCH v3 04/15] drm/i915/buddy: track available visible size Matthew Auld
2022-02-11 11:34 ` [PATCH v3 05/15] drm/i915/buddy: adjust res->start Matthew Auld
2022-02-11 11:34 ` [PATCH v3 06/15] drm/i915/buddy: tweak 2big check Matthew Auld
2022-02-11 11:34 ` [PATCH v3 07/15] drm/i915/selftests: mock test io_size Matthew Auld
2022-02-11 11:34 ` [PATCH v3 08/15] drm/i915/ttm: make eviction mappable aware Matthew Auld
2022-02-11 11:34 ` [PATCH v3 09/15] drm/i915/ttm: mappable migration on fault Matthew Auld
2022-02-11 11:34 ` [PATCH v3 10/15] drm/i915/selftests: exercise mmap migration Matthew Auld
2022-02-11 11:34 ` [PATCH v3 11/15] drm/i915/selftests: handle allocation failures Matthew Auld
2022-02-11 11:34 ` [PATCH v3 12/15] drm/i915/create: apply ALLOC_GPU_ONLY by default Matthew Auld
2022-02-11 12:48 ` Thomas Hellström
2022-02-11 11:34 ` [PATCH v3 13/15] drm/i915/uapi: add NEEDS_CPU_ACCESS hint Matthew Auld
2022-02-11 11:34 ` [PATCH v3 14/15] drm/i915/uapi: forbid ALLOC_GPU_ONLY for error capture Matthew Auld
2022-02-11 12:50 ` Thomas Hellström
2022-02-11 11:34 ` [PATCH v3 15/15] drm/i915/lmem: don't treat small BAR as an error Matthew Auld
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=20220211113437.874691-3-matthew.auld@intel.com \
--to=matthew.auld@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=nirmoy.das@intel.com \
--cc=thomas.hellstrom@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