From: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
To: Matthew Auld <matthew.auld@intel.com>, intel-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH 19/20] drm/i915/lmem: don't treat small BAR as an error
Date: Thu, 3 Feb 2022 10:48:32 +0100 [thread overview]
Message-ID: <a537f361-ae72-c62c-062f-4e96a9e48682@linux.intel.com> (raw)
In-Reply-To: <20220126152155.3070602-20-matthew.auld@intel.com>
On 1/26/22 16:21, Matthew Auld wrote:
> 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.
Changes here LGTM.
>
> It does leave open with what to do with stolen local-memory.
Are objects in stolen local required to be mappable?
/Thomas
>
> 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 2c7ec7ff79fd..b788fc2b3df8 100644
> --- a/drivers/gpu/drm/i915/gt/intel_region_lmem.c
> +++ b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
> @@ -200,6 +200,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;
>
> @@ -210,7 +211,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 :
> @@ -220,7 +222,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);
WARNING: multiple messages have this Message-ID (diff)
From: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
To: Matthew Auld <matthew.auld@intel.com>, intel-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Subject: Re: [PATCH 19/20] drm/i915/lmem: don't treat small BAR as an error
Date: Thu, 3 Feb 2022 10:48:32 +0100 [thread overview]
Message-ID: <a537f361-ae72-c62c-062f-4e96a9e48682@linux.intel.com> (raw)
In-Reply-To: <20220126152155.3070602-20-matthew.auld@intel.com>
On 1/26/22 16:21, Matthew Auld wrote:
> 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.
Changes here LGTM.
>
> It does leave open with what to do with stolen local-memory.
Are objects in stolen local required to be mappable?
/Thomas
>
> 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 2c7ec7ff79fd..b788fc2b3df8 100644
> --- a/drivers/gpu/drm/i915/gt/intel_region_lmem.c
> +++ b/drivers/gpu/drm/i915/gt/intel_region_lmem.c
> @@ -200,6 +200,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;
>
> @@ -210,7 +211,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 :
> @@ -220,7 +222,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);
next prev parent reply other threads:[~2022-02-03 9:48 UTC|newest]
Thread overview: 105+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-26 15:21 [Intel-gfx] [PATCH 00/20] Initial support for small BAR recovery Matthew Auld
2022-01-26 15:21 ` Matthew Auld
2022-01-26 15:21 ` [Intel-gfx] [PATCH 01/20] drm: improve drm_buddy_alloc function Matthew Auld
2022-01-26 15:21 ` Matthew Auld
2022-01-26 18:03 ` [Intel-gfx] " Jani Nikula
2022-01-26 15:21 ` [Intel-gfx] [PATCH 02/20] drm: implement top-down allocation method Matthew Auld
2022-01-26 15:21 ` Matthew Auld
2022-01-26 18:42 ` [Intel-gfx] " Robert Beckett
2022-01-26 15:21 ` [Intel-gfx] [PATCH 03/20] drm: implement a method to free unused pages Matthew Auld
2022-01-26 15:21 ` Matthew Auld
2022-01-26 15:21 ` [Intel-gfx] [PATCH 04/20] drm/i915: add io_size plumbing Matthew Auld
2022-01-26 15:21 ` Matthew Auld
2022-01-31 15:14 ` [Intel-gfx] " Thomas Hellström
2022-01-31 15:14 ` Thomas Hellström
2022-01-26 15:21 ` [Intel-gfx] [PATCH 05/20] drm/i915/ttm: require mappable by default Matthew Auld
2022-01-26 15:21 ` Matthew Auld
2022-01-26 15:21 ` [Intel-gfx] [PATCH 06/20] drm/i915: add I915_BO_ALLOC_TOPDOWN Matthew Auld
2022-01-26 15:21 ` Matthew Auld
2022-01-31 15:28 ` [Intel-gfx] " Thomas Hellström
2022-01-31 15:28 ` Thomas Hellström
2022-01-31 15:49 ` [Intel-gfx] " Matthew Auld
2022-01-31 15:49 ` Matthew Auld
2022-01-26 15:21 ` [Intel-gfx] [PATCH 07/20] drm/i915/buddy: track available visible size Matthew Auld
2022-01-26 15:21 ` Matthew Auld
2022-01-31 16:12 ` [Intel-gfx] " Thomas Hellström
2022-01-31 16:12 ` Thomas Hellström
2022-01-26 15:21 ` [Intel-gfx] [PATCH 08/20] drm/i915/buddy: adjust res->start Matthew Auld
2022-01-26 15:21 ` Matthew Auld
2022-02-01 10:38 ` [Intel-gfx] " Thomas Hellström
2022-02-01 10:38 ` Thomas Hellström
2022-01-26 15:21 ` [Intel-gfx] [PATCH 09/20] drm/i915/buddy: tweak 2big check Matthew Auld
2022-01-26 15:21 ` Matthew Auld
2022-02-01 10:39 ` [Intel-gfx] " Thomas Hellström
2022-02-01 10:39 ` Thomas Hellström
2022-01-26 15:21 ` [Intel-gfx] [PATCH 10/20] drm/i915/selftests: mock test io_size Matthew Auld
2022-01-26 15:21 ` Matthew Auld
2022-02-02 10:24 ` [Intel-gfx] " Thomas Hellström
2022-02-02 10:24 ` Thomas Hellström
2022-01-26 15:21 ` [Intel-gfx] [PATCH 11/20] drm/i915/ttm: tweak priority hint selection Matthew Auld
2022-01-26 15:21 ` Matthew Auld
2022-02-02 13:34 ` [Intel-gfx] " Thomas Hellström
2022-02-02 13:34 ` Thomas Hellström
2022-01-26 15:21 ` [Intel-gfx] [PATCH 12/20] drm/i915/ttm: make eviction mappable aware Matthew Auld
2022-01-26 15:21 ` Matthew Auld
2022-02-02 13:41 ` [Intel-gfx] " Thomas Hellström
2022-02-02 13:41 ` Thomas Hellström
2022-01-26 15:21 ` [Intel-gfx] [PATCH 13/20] drm/i915/ttm: mappable migration on fault Matthew Auld
2022-01-26 15:21 ` Matthew Auld
2022-02-03 7:59 ` [Intel-gfx] " Thomas Hellström
2022-02-03 7:59 ` Thomas Hellström
2022-01-26 15:21 ` [Intel-gfx] [PATCH 14/20] drm/i915/selftests: exercise mmap migration Matthew Auld
2022-01-26 15:21 ` Matthew Auld
2022-02-03 9:01 ` [Intel-gfx] " Thomas Hellström
2022-02-03 9:01 ` Thomas Hellström
2022-02-03 9:12 ` [Intel-gfx] " Matthew Auld
2022-02-03 9:12 ` Matthew Auld
2022-01-26 15:21 ` [Intel-gfx] [PATCH 15/20] drm/i915/selftests: handle allocation failures Matthew Auld
2022-01-26 15:21 ` Matthew Auld
2022-02-03 9:05 ` [Intel-gfx] " Thomas Hellström
2022-02-03 9:05 ` Thomas Hellström
2022-02-03 9:11 ` [Intel-gfx] " Matthew Auld
2022-02-03 9:11 ` Matthew Auld
2022-01-26 15:21 ` [Intel-gfx] [PATCH 16/20] drm/i915/create: apply ALLOC_TOPDOWN by default Matthew Auld
2022-01-26 15:21 ` Matthew Auld
2022-02-03 9:17 ` [Intel-gfx] " Thomas Hellström
2022-02-03 9:17 ` Thomas Hellström
2022-02-03 9:32 ` [Intel-gfx] " Matthew Auld
2022-02-03 9:32 ` Matthew Auld
2022-01-26 15:21 ` [Intel-gfx] [PATCH 17/20] drm/i915/uapi: add NEEDS_CPU_ACCESS hint Matthew Auld
2022-01-26 15:21 ` Matthew Auld
2022-02-03 9:28 ` [Intel-gfx] " Thomas Hellström
2022-02-03 9:28 ` Thomas Hellström
2022-02-03 11:38 ` [Intel-gfx] " Matthew Auld
2022-02-03 11:38 ` Matthew Auld
2022-02-03 13:29 ` [Intel-gfx] " Thomas Hellström
2022-02-03 13:29 ` Thomas Hellström
2022-01-26 15:21 ` [Intel-gfx] [PATCH 18/20] drm/i915/uapi: forbid ALLOC_TOPDOWN for error capture Matthew Auld
2022-01-26 15:21 ` Matthew Auld
2022-01-26 19:42 ` [Intel-gfx] " kernel test robot
2022-01-26 19:42 ` kernel test robot
2022-01-26 20:03 ` kernel test robot
2022-01-26 20:03 ` kernel test robot
2022-01-26 20:03 ` kernel test robot
2022-02-03 9:43 ` Thomas Hellström
2022-02-03 9:43 ` Thomas Hellström
2022-02-03 9:44 ` [Intel-gfx] " Matthew Auld
2022-02-03 9:44 ` Matthew Auld
2022-01-26 15:21 ` [Intel-gfx] [PATCH 19/20] drm/i915/lmem: don't treat small BAR as an error Matthew Auld
2022-01-26 15:21 ` Matthew Auld
2022-02-03 9:48 ` Thomas Hellström [this message]
2022-02-03 9:48 ` Thomas Hellström
2022-02-03 11:18 ` [Intel-gfx] " Matthew Auld
2022-02-03 11:18 ` Matthew Auld
2022-02-03 13:56 ` [Intel-gfx] " Thomas Hellström
2022-02-03 13:56 ` Thomas Hellström
2022-02-03 14:09 ` [Intel-gfx] " Matthew Auld
2022-02-03 14:09 ` Matthew Auld
2022-01-26 15:21 ` [Intel-gfx] [PATCH 20/20] HAX: DG1 small BAR Matthew Auld
2022-01-26 15:21 ` Matthew Auld
2022-01-26 21:07 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Initial support for small BAR recovery Patchwork
2022-01-26 21:08 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2022-01-26 21:41 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2022-01-27 16:27 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Initial support for small BAR recovery (rev2) Patchwork
2022-01-27 16:28 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2022-01-27 16:57 ` [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=a537f361-ae72-c62c-062f-4e96a9e48682@linux.intel.com \
--to=thomas.hellstrom@linux.intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=matthew.auld@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.