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: [Intel-gfx] [PATCH v2 1/8] drm/i915/lmem: don't treat small BAR as an error
Date: Thu, 10 Mar 2022 12:27:44 +0000 [thread overview]
Message-ID: <20220310122751.89693-2-matthew.auld@intel.com> (raw)
In-Reply-To: <20220310122751.89693-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>
Reviewed-by: 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 6cecfdae07ad..783d81072c3b 100644
--- a/drivers/gpu/drm/i915/gt/intel_region_lmem.c
+++ b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
@@ -93,6 +93,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;
@@ -124,7 +125,8 @@ static struct intel_memory_region *setup_lmem(struct intel_gt *gt)
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 :
@@ -134,7 +136,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
WARNING: multiple messages have this Message-ID (diff)
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 1/8] drm/i915/lmem: don't treat small BAR as an error
Date: Thu, 10 Mar 2022 12:27:44 +0000 [thread overview]
Message-ID: <20220310122751.89693-2-matthew.auld@intel.com> (raw)
In-Reply-To: <20220310122751.89693-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>
Reviewed-by: 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 6cecfdae07ad..783d81072c3b 100644
--- a/drivers/gpu/drm/i915/gt/intel_region_lmem.c
+++ b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
@@ -93,6 +93,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;
@@ -124,7 +125,8 @@ static struct intel_memory_region *setup_lmem(struct intel_gt *gt)
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 :
@@ -134,7 +136,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-03-10 12:28 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-10 12:27 [Intel-gfx] [PATCH v2 0/8] Some more bits for small BAR enabling Matthew Auld
2022-03-10 12:27 ` Matthew Auld
2022-03-10 12:27 ` Matthew Auld [this message]
2022-03-10 12:27 ` [PATCH v2 1/8] drm/i915/lmem: don't treat small BAR as an error Matthew Auld
2022-03-10 12:27 ` [Intel-gfx] [PATCH v2 2/8] drm/i915/stolen: " Matthew Auld
2022-03-10 12:27 ` Matthew Auld
2022-03-10 12:27 ` [Intel-gfx] [PATCH v2 3/8] drm/i915/stolen: consider I915_BO_ALLOC_GPU_ONLY Matthew Auld
2022-03-10 12:27 ` Matthew Auld
2022-03-10 12:27 ` [Intel-gfx] [PATCH v2 4/8] drm/i915: add i915_gem_object_create_region_at() Matthew Auld
2022-03-10 12:27 ` Matthew Auld
2022-03-10 12:27 ` [Intel-gfx] [PATCH v2 5/8] drm/i915/ttm: wire up the object offset Matthew Auld
2022-03-10 12:27 ` Matthew Auld
2022-03-10 12:27 ` [Intel-gfx] [PATCH v2 6/8] drm/i915/display: Check mappable aperture when pinning preallocated vma Matthew Auld
2022-03-10 12:27 ` Matthew Auld
2022-03-11 11:06 ` [Intel-gfx] " Matthew Auld
2022-03-10 12:27 ` [Intel-gfx] [PATCH v2 7/8] drm/i915: fixup the initial fb base on DG1 Matthew Auld
2022-03-10 12:27 ` Matthew Auld
2022-03-10 12:27 ` [Intel-gfx] [PATCH v2 8/8] drm/i915: fixup the initial fb on DG2 Matthew Auld
2022-03-10 12:27 ` Matthew Auld
2022-03-10 12:59 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for Some more bits for small BAR enabling (rev2) Patchwork
2022-03-10 13:30 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2022-03-10 17:10 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for Some more bits for small BAR enabling (rev3) Patchwork
2022-03-10 17:40 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-03-10 22:01 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2022-03-11 10:55 ` [Intel-gfx] [PATCH v2 0/8] Some more bits for small BAR enabling 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=20220310122751.89693-2-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.