From: Jonathan Cavitt <jonathan.cavitt@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: jonathan.cavitt@intel.com, matthew.auld@intel.com
Subject: [Intel-gfx] [PATCH] gen8_ppgtt: Use correct huge page manager for MTL
Date: Fri, 17 Feb 2023 11:18:13 -0800 [thread overview]
Message-ID: <20230217191813.1104342-1-jonathan.cavitt@intel.com> (raw)
MTL currently uses gen8_ppgtt_insert_huge when managing huge pages. This is because
MTL reports as not supporting 64K pages, or more accurately, the system that reports
whether a platform has 64K pages reports false for MTL. This is only half correct,
as the 64K page support reporting system only cares about 64K page support for LMEM,
which MTL doesn't have.
MTL should be using xehpsdv_ppgtt_insert_huge. However, simply changing over to
using that manager doesn't resolve the issue because MTL is expecting the virtual
address space for the page table to be flushed after initialization, so we must also
add a flush statement there.
Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
---
drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gt/gen8_ppgtt.c b/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
index 4daaa6f55668..9c571185395f 100644
--- a/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
+++ b/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
@@ -570,6 +570,7 @@ xehpsdv_ppgtt_insert_huge(struct i915_address_space *vm,
}
} while (rem >= page_size && index < max);
+ drm_clflush_virt_range(vaddr, PAGE_SIZE);
vma_res->page_sizes_gtt |= page_size;
} while (iter->sg && sg_dma_len(iter->sg));
}
@@ -707,7 +708,7 @@ static void gen8_ppgtt_insert(struct i915_address_space *vm,
struct sgt_dma iter = sgt_dma(vma_res);
if (vma_res->bi.page_sizes.sg > I915_GTT_PAGE_SIZE) {
- if (HAS_64K_PAGES(vm->i915))
+ if (GRAPHICS_VER_FULL(vm->i915) >= IP_VER(12, 50))
xehpsdv_ppgtt_insert_huge(vm, vma_res, &iter, cache_level, flags);
else
gen8_ppgtt_insert_huge(vm, vma_res, &iter, cache_level, flags);
--
2.25.1
next reply other threads:[~2023-02-17 19:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-17 19:18 Jonathan Cavitt [this message]
2023-02-17 21:00 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for gen8_ppgtt: Use correct huge page manager for MTL Patchwork
2023-02-17 21:22 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-02-18 11:02 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2023-02-21 16:06 ` [Intel-gfx] [PATCH] " Matthew Auld
2023-02-21 16:07 ` Matthew Auld
2023-02-21 16:28 ` Cavitt, Jonathan
2023-02-21 16:32 ` Matthew Auld
2023-02-21 17:14 ` Cavitt, Jonathan
2023-02-21 17:46 ` Matthew Auld
2023-02-21 18:34 ` Cavitt, Jonathan
2023-02-22 9:35 ` Matthew Auld
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=20230217191813.1104342-1-jonathan.cavitt@intel.com \
--to=jonathan.cavitt@intel.com \
--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.