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
Subject: [PATCH v2 15/15] drm/i915/lmem: don't treat small BAR as an error
Date: Thu, 10 Feb 2022 12:13:13 +0000 [thread overview]
Message-ID: <20220210121313.701004-16-matthew.auld@intel.com> (raw)
In-Reply-To: <20220210121313.701004-1-matthew.auld@intel.com>
Just pass along the probed io_size. The backend should be able to
utilize the entire range here, even if some of it is non-mappable.
It does leave open with what to do with stolen local-memory.
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
---
drivers/gpu/drm/i915/gt/intel_region_lmem.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_region_lmem.c b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
index 01838b8ce4c7..ad3cf348b4a8 100644
--- a/drivers/gpu/drm/i915/gt/intel_region_lmem.c
+++ b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
@@ -201,6 +201,7 @@ static struct intel_memory_region *setup_lmem(struct intel_gt *gt)
struct intel_memory_region *mem;
resource_size_t min_page_size;
resource_size_t io_start;
+ resource_size_t io_size;
resource_size_t lmem_size;
int err;
@@ -211,7 +212,8 @@ static struct intel_memory_region *setup_lmem(struct intel_gt *gt)
lmem_size = intel_uncore_read64(uncore, GEN12_GSMBASE);
io_start = pci_resource_start(pdev, 2);
- if (GEM_WARN_ON(lmem_size > pci_resource_len(pdev, 2)))
+ io_size = min(pci_resource_len(pdev, 2), lmem_size);
+ if (!io_size)
return ERR_PTR(-ENODEV);
min_page_size = HAS_64K_PAGES(i915) ? I915_GTT_PAGE_SIZE_64K :
@@ -221,7 +223,7 @@ static struct intel_memory_region *setup_lmem(struct intel_gt *gt)
lmem_size,
min_page_size,
io_start,
- lmem_size,
+ io_size,
INTEL_MEMORY_LOCAL,
0,
&intel_region_lmem_ops);
--
2.34.1
next prev parent reply other threads:[~2022-02-10 12:17 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-10 12:12 [PATCH v2 00/15] Initial support for small BAR recovery Matthew Auld
2022-02-10 12:12 ` [PATCH v2 01/15] drm/i915: add io_size plumbing Matthew Auld
2022-02-10 12:13 ` [PATCH v2 02/15] drm/i915/ttm: require mappable by default Matthew Auld
2022-02-11 9:20 ` Thomas Hellström
2022-02-10 12:13 ` [PATCH v2 03/15] drm/i915: add I915_BO_ALLOC_GPU_ONLY Matthew Auld
2022-02-11 9:23 ` Thomas Hellström
2022-02-10 12:13 ` [PATCH v2 04/15] drm/i915/buddy: track available visible size Matthew Auld
2022-02-11 9:25 ` Thomas Hellström
2022-02-10 12:13 ` [PATCH v2 05/15] drm/i915/buddy: adjust res->start Matthew Auld
2022-02-10 12:13 ` [PATCH v2 06/15] drm/i915/buddy: tweak 2big check Matthew Auld
2022-02-10 12:13 ` [PATCH v2 07/15] drm/i915/selftests: mock test io_size Matthew Auld
2022-02-10 12:13 ` [PATCH v2 08/15] drm/i915/ttm: make eviction mappable aware Matthew Auld
2022-02-10 12:13 ` [PATCH v2 09/15] drm/i915/ttm: mappable migration on fault Matthew Auld
2022-02-10 12:13 ` [PATCH v2 10/15] drm/i915/selftests: exercise mmap migration Matthew Auld
2022-02-11 9:36 ` Thomas Hellström
2022-02-10 12:13 ` [PATCH v2 11/15] drm/i915/selftests: handle allocation failures Matthew Auld
2022-02-11 9:37 ` Thomas Hellström
2022-02-10 12:13 ` [PATCH v2 12/15] drm/i915/create: apply ALLOC_GPU_ONLY by default Matthew Auld
2022-02-11 9:49 ` Thomas Hellström
2022-02-11 9:52 ` [Intel-gfx] " Matthew Auld
2022-02-11 9:55 ` Thomas Hellström
2022-02-11 10:00 ` Matthew Auld
2022-02-11 10:14 ` Thomas Hellström
2022-02-10 12:13 ` [PATCH v2 13/15] drm/i915/uapi: add NEEDS_CPU_ACCESS hint Matthew Auld
2022-02-11 9:59 ` Thomas Hellström
2022-02-10 12:13 ` [PATCH v2 14/15] drm/i915/uapi: forbid ALLOC_GPU_ONLY for error capture Matthew Auld
2022-02-11 10:06 ` Thomas Hellström
2022-02-10 12:13 ` Matthew Auld [this message]
2022-02-11 10:08 ` [PATCH v2 15/15] drm/i915/lmem: don't treat small BAR as an error Thomas Hellström
2022-02-10 14:40 ` [Intel-gfx] [PATCH v2 00/15] Initial support for small BAR recovery Das, Nirmoy
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=20220210121313.701004-16-matthew.auld@intel.com \
--to=matthew.auld@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--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;
as well as URLs for NNTP newsgroup(s).