From: Matthew Auld <matthew.auld@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH 2/7] drm/i915: reserve stolen for LMEM region
Date: Tue, 26 Jan 2021 09:46:07 +0000 [thread overview]
Message-ID: <20210126094612.163290-2-matthew.auld@intel.com> (raw)
In-Reply-To: <20210126094612.163290-1-matthew.auld@intel.com>
From: CQ Tang <cq.tang@intel.com>
The lmem region needs to remove the stolen part, which should just be a
case of snipping it off the end.
Signed-off-by: CQ Tang <cq.tang@intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
---
drivers/gpu/drm/i915/gt/intel_region_lmem.c | 12 ++++++++----
drivers/gpu/drm/i915/i915_reg.h | 2 ++
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_region_lmem.c b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
index bdd38efe0811..30959c1e535f 100644
--- a/drivers/gpu/drm/i915/gt/intel_region_lmem.c
+++ b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
@@ -140,21 +140,24 @@ intel_setup_fake_lmem(struct drm_i915_private *i915)
static struct intel_memory_region *
setup_lmem(struct drm_i915_private *i915)
{
+ struct intel_uncore *uncore = &i915->uncore;
struct pci_dev *pdev = i915->drm.pdev;
struct intel_memory_region *mem;
resource_size_t io_start;
- resource_size_t size;
+ resource_size_t lmem_size;
/* Enables Local Memory functionality in GAM */
intel_uncore_write(&i915->uncore, GEN12_LMEM_CFG_ADDR,
intel_uncore_read(&i915->uncore, GEN12_LMEM_CFG_ADDR) | LMEM_ENABLE);
+ /* Stolen starts from GSMBASE on DG1 */
+ lmem_size = intel_uncore_read64(uncore, GEN12_GSMBASE);
+
io_start = pci_resource_start(pdev, 2);
- size = pci_resource_len(pdev, 2);
mem = intel_memory_region_create(i915,
0,
- size,
+ lmem_size,
I915_GTT_PAGE_SIZE_4K,
io_start,
&intel_region_lmem_ops);
@@ -162,7 +165,8 @@ setup_lmem(struct drm_i915_private *i915)
drm_dbg(&i915->drm, "Intel graphics LMEM: %pR\n", &mem->region);
drm_dbg(&i915->drm, "Intel graphics LMEM IO start: %pa\n",
&mem->io_start);
- drm_info(&i915->drm, "Intel graphics LMEM size: %pa\n", &size);
+ drm_info(&i915->drm, "Intel graphics LMEM size: %pa\n",
+ &lmem_size);
}
return mem;
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 28001b5a3cb5..626ebbe64bfd 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -12114,6 +12114,8 @@ enum skl_power_gate {
#define GEN12_LMEM_CFG_ADDR _MMIO(0xcf58)
#define LMEM_ENABLE (1 << 31)
+#define GEN12_GSMBASE _MMIO(0x108100)
+
/* gamt regs */
#define GEN8_L3_LRA_1_GPGPU _MMIO(0x4dd4)
#define GEN8_L3_LRA_1_GPGPU_DEFAULT_VALUE_BDW 0x67F1427F /* max/min for LRA1/2 */
--
2.26.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2021-01-26 9:46 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-26 9:46 [Intel-gfx] [PATCH 1/7] drm/i915: setup the LMEM region Matthew Auld
2021-01-26 9:46 ` Matthew Auld [this message]
2021-01-26 10:27 ` [Intel-gfx] [PATCH 2/7] drm/i915: reserve stolen for " Chris Wilson
2021-01-26 10:38 ` Matthew Auld
2021-01-26 9:46 ` [Intel-gfx] [PATCH 3/7] drm/i915: introduce mem->reserved Matthew Auld
2021-01-26 9:46 ` [Intel-gfx] [PATCH 4/7] drm/i915/dg1: Reserve first 1MB of local memory Matthew Auld
2021-01-26 9:46 ` [Intel-gfx] [PATCH 5/7] drm/i915: allocate context from LMEM Matthew Auld
2021-01-26 9:46 ` [Intel-gfx] [PATCH 6/7] drm/i915: move engine scratch to LMEM Matthew Auld
2021-01-26 9:46 ` [Intel-gfx] [PATCH 7/7] drm/i915: allocate cmd ring in lmem Matthew Auld
2021-01-26 10:09 ` [Intel-gfx] [PATCH 1/7] drm/i915: setup the LMEM region Tvrtko Ursulin
2021-01-26 10:38 ` Matthew Auld
2021-01-26 10:46 ` Chris Wilson
2021-01-26 10:20 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/7] " Patchwork
2021-01-26 10:21 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2021-01-26 10:51 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
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=20210126094612.163290-2-matthew.auld@intel.com \
--to=matthew.auld@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/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).