From: Matthew Auld <matthew.auld@intel.com>
To: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>,
intel-gfx@lists.freedesktop.org
Cc: Jani Nikula <jani.nikula@intel.com>,
Lucas De Marchi <lucas.demarchi@intel.com>
Subject: Re: [Intel-gfx] [PATCH 1/7] drm/i915: setup the LMEM region
Date: Tue, 26 Jan 2021 10:38:09 +0000 [thread overview]
Message-ID: <7880508f-6f43-19a4-c916-30a251cc1f39@intel.com> (raw)
In-Reply-To: <4868954d-e4a3-a72b-c114-39f8ee00404b@linux.intel.com>
On 26/01/2021 10:09, Tvrtko Ursulin wrote:
>
> On 26/01/2021 09:46, Matthew Auld wrote:
>> Hook up the LMEM region. Addresses will start from zero, and for CPU
>> access we get LMEM_BAR which is just a 1:1 mapping of said region.
>>
>> Based on a patch from Michel Thierry.
>>
>> v2 by Jani:
>> - use intel_uncore_read/intel_uncore_write
>> - remove trailing blank line
>>
>> v3: s/drm_info/drm_dbg for info which in non-pertinent for the user
>>
>> Cc: Lucas De Marchi <lucas.demarchi@intel.com>
>> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> Signed-off-by: Matthew Auld <matthew.auld@intel.com>
>> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>> drivers/gpu/drm/i915/gt/intel_region_lmem.c | 37 +++++++++++++++++++++
>> drivers/gpu/drm/i915/gt/intel_region_lmem.h | 2 ++
>> drivers/gpu/drm/i915/i915_reg.h | 3 ++
>> drivers/gpu/drm/i915/intel_memory_region.c | 11 +++++-
>> 4 files changed, 52 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/gt/intel_region_lmem.c
>> b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
>> index 28a1d5e1fb92..bdd38efe0811 100644
>> --- a/drivers/gpu/drm/i915/gt/intel_region_lmem.c
>> +++ b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
>> @@ -136,3 +136,40 @@ intel_setup_fake_lmem(struct drm_i915_private *i915)
>> return mem;
>> }
>> +
>> +static struct intel_memory_region *
>> +setup_lmem(struct drm_i915_private *i915)
>> +{ > + struct pci_dev *pdev = i915->drm.pdev;
>> + struct intel_memory_region *mem;
>> + resource_size_t io_start;
>> + resource_size_t 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);
>
> You could use intel_uncore_rmw as well for some minimal improvement in
> readability. Just a passing by observation, no need to respin if it
> doesn't fit the schedules.
On second thought, I think we can just drop this since it should be
default enabled nowadays anyway.
>
>> +
>> + io_start = pci_resource_start(pdev, 2);
>> + size = pci_resource_len(pdev, 2);
>> +
>> + mem = intel_memory_region_create(i915,
>> + 0,
>> + size,
>> + I915_GTT_PAGE_SIZE_4K,
>> + io_start,
>> + &intel_region_lmem_ops);
>> + if (!IS_ERR(mem)) {
>> + 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);
>> + }
>> +
>> + return mem;
>> +}
>> +
>> +struct intel_memory_region *
>> +i915_gem_setup_lmem(struct drm_i915_private *i915)
>> +{
>> + return setup_lmem(i915);
>> +}
>
> Was it ever discussed if there was an easy way (and if it makes sense
> actually) to move this from GEM to GT (in name and input parameter?
Yeah, makes sense, especially since this is now in gt/
So just:
intel_gt_setup_lmem(gt)
?
>
> Regards,
>
> Tvrtko
>
>> diff --git a/drivers/gpu/drm/i915/gt/intel_region_lmem.h
>> b/drivers/gpu/drm/i915/gt/intel_region_lmem.h
>> index 8ea43e538dab..b32222bd493c 100644
>> --- a/drivers/gpu/drm/i915/gt/intel_region_lmem.h
>> +++ b/drivers/gpu/drm/i915/gt/intel_region_lmem.h
>> @@ -8,6 +8,8 @@
>> struct drm_i915_private;
>> +struct intel_memory_region *i915_gem_setup_lmem(struct
>> drm_i915_private *i915);
>> +
>> struct intel_memory_region *
>> intel_setup_fake_lmem(struct drm_i915_private *i915);
>> diff --git a/drivers/gpu/drm/i915/i915_reg.h
>> b/drivers/gpu/drm/i915/i915_reg.h
>> index e7e41a3c467e..28001b5a3cb5 100644
>> --- a/drivers/gpu/drm/i915/i915_reg.h
>> +++ b/drivers/gpu/drm/i915/i915_reg.h
>> @@ -12111,6 +12111,9 @@ enum skl_power_gate {
>> #define GEN12_GLOBAL_MOCS(i) _MMIO(0x4000 + (i) * 4) /* Global
>> MOCS regs */
>> +#define GEN12_LMEM_CFG_ADDR _MMIO(0xcf58)
>> +#define LMEM_ENABLE (1 << 31)
>> +
>> /* 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 */
>> diff --git a/drivers/gpu/drm/i915/intel_memory_region.c
>> b/drivers/gpu/drm/i915/intel_memory_region.c
>> index 1bfcdd89b241..9ce4a81c48b1 100644
>> --- a/drivers/gpu/drm/i915/intel_memory_region.c
>> +++ b/drivers/gpu/drm/i915/intel_memory_region.c
>> @@ -259,7 +259,16 @@ int intel_memory_regions_hw_probe(struct
>> drm_i915_private *i915)
>> mem = i915_gem_stolen_setup(i915);
>> break;
>> case INTEL_MEMORY_LOCAL:
>> - mem = intel_setup_fake_lmem(i915);
>> +#if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
>> + if (IS_ENABLED(CONFIG_DRM_I915_UNSTABLE_FAKE_LMEM)) {
>> + if (INTEL_GEN(i915) >= 9 && i915_selftest.live < 0 &&
>> + i915->params.fake_lmem_start)
>> + mem = intel_setup_fake_lmem(i915);
>> + }
>> +#endif
>> +
>> + if (IS_ERR(mem))
>> + mem = i915_gem_setup_lmem(i915);
>> break;
>> }
>>
_______________________________________________
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 10:38 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 ` [Intel-gfx] [PATCH 2/7] drm/i915: reserve stolen for " Matthew Auld
2021-01-26 10:27 ` 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 [this message]
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=7880508f-6f43-19a4-c916-30a251cc1f39@intel.com \
--to=matthew.auld@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=lucas.demarchi@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;
as well as URLs for NNTP newsgroup(s).