From: Matthew Auld <matthew.auld@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 12/21] drm/i915: support 2M pages for the 48b PPGTT
Date: Mon, 3 Jul 2017 15:14:54 +0100 [thread overview]
Message-ID: <20170703141503.12609-13-matthew.auld@intel.com> (raw)
In-Reply-To: <20170703141503.12609-1-matthew.auld@intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/i915_gem_gtt.c | 8 ++++++++
drivers/gpu/drm/i915/i915_gem_gtt.h | 2 ++
2 files changed, 10 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 861b1442b6c4..be11c83d5c91 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -972,6 +972,14 @@ static void gen8_ppgtt_insert_huge_entries(struct i915_vma *vma,
max = GEN8_PML4ES_PER_PML4;
page_size = I915_GTT_PAGE_SIZE_1G;
encode |= GEN8_PDPE_PS_1G;
+ } else if (vma->page_sizes.sg & I915_GTT_PAGE_SIZE_2M &&
+ IS_ALIGNED(iter->dma, I915_GTT_PAGE_SIZE_2M) &&
+ rem >= I915_GTT_PAGE_SIZE_2M && !idx.pte) {
+ vaddr = kmap_atomic_px(pd);
+ index = idx.pde;
+ max = I915_PDES;
+ page_size = I915_GTT_PAGE_SIZE_2M;
+ encode |= GEN8_PDE_PS_2M;
} else {
vaddr = kmap_atomic_px(pt);
index = idx.pte;
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h b/drivers/gpu/drm/i915/i915_gem_gtt.h
index e46f05f0cfd9..aa4488637fc9 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.h
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
@@ -149,6 +149,8 @@ typedef u64 gen8_ppgtt_pml4e_t;
#define GEN8_PPAT_ELLC_OVERRIDE (0<<2)
#define GEN8_PPAT(i, x) ((u64)(x) << ((i) * 8))
+#define GEN8_PDE_PS_2M BIT(7)
+
#define GEN8_PDPE_PS_1G BIT(7)
struct sg_table;
--
2.9.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-07-03 14:15 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-03 14:14 [PATCH 00/21] huge gtt pages Matthew Auld
2017-07-03 14:14 ` [PATCH 01/21] mm/shmem: introduce shmem_file_setup_with_mnt Matthew Auld
2017-07-03 14:14 ` [PATCH 02/21] drm/i915: introduce simple gemfs Matthew Auld
2017-07-03 14:14 ` [PATCH 03/21] drm/i915/gemfs: enable THP Matthew Auld
2017-07-03 14:14 ` [PATCH 04/21] drm/i915: introduce page_size_mask to dev_info Matthew Auld
2017-07-03 14:14 ` [PATCH 05/21] drm/i915: introduce page_size members Matthew Auld
2017-07-03 14:14 ` [PATCH 06/21] drm/i915: introduce vm set_pages/clear_pages Matthew Auld
2017-07-03 14:14 ` [PATCH 07/21] drm/i915: align the vma start to the largest gtt page size Matthew Auld
2017-07-03 14:14 ` [PATCH 08/21] drm/i915: align 64K objects to 2M Matthew Auld
2017-07-03 14:14 ` [PATCH 09/21] drm/i915: enable IPS bit for 64K pages Matthew Auld
2017-07-03 14:14 ` [PATCH 10/21] drm/i915: disable GTT cache for 2M/1G pages Matthew Auld
2017-07-03 14:14 ` [PATCH 11/21] drm/i915: support 1G pages for the 48b PPGTT Matthew Auld
2017-07-03 14:14 ` Matthew Auld [this message]
2017-07-03 14:14 ` [PATCH 13/21] drm/i915: support 64K " Matthew Auld
2017-07-03 14:14 ` [PATCH 14/21] drm/i915: accurate page size tracking for the ppgtt Matthew Auld
2017-07-03 14:14 ` [PATCH 15/21] drm/i915/debugfs: include some gtt page size metrics Matthew Auld
2017-07-03 14:14 ` [PATCH 16/21] drm/i915/selftests: huge page tests Matthew Auld
2017-07-03 14:48 ` Chris Wilson
2017-07-06 11:05 ` Matthew Auld
2017-07-05 15:40 ` Chris Wilson
2017-07-03 14:14 ` [PATCH 17/21] drm/i915/selftests: mix huge pages Matthew Auld
2017-07-03 14:15 ` [PATCH 18/21] drm/i915: disable platform support for vGPU huge gtt pages Matthew Auld
2017-07-03 14:15 ` [PATCH 19/21] drm/i915: enable platform support for 64K pages Matthew Auld
2017-07-03 14:15 ` [PATCH 20/21] drm/i915: enable platform support for 2M pages Matthew Auld
2017-07-03 14:15 ` [PATCH 21/21] drm/i915: enable platform support for 1G pages Matthew Auld
2017-07-03 14:55 ` ✓ Fi.CI.BAT: success for huge gtt pages (rev4) Patchwork
-- strict thread matches above, loose matches on Subject: below --
2017-07-25 19:21 [PATCH 00/21] huge gtt pages Matthew Auld
2017-07-25 19:21 ` [PATCH 12/21] drm/i915: support 2M pages for the 48b PPGTT Matthew Auld
2017-09-22 17:32 [PATCH 00/21] huge gtt pages Matthew Auld
2017-09-22 17:32 ` [PATCH 12/21] drm/i915: support 2M pages for the 48b PPGTT Matthew Auld
2017-09-23 8:48 ` Chris Wilson
2017-09-29 16:10 [PATCH 00/21] huge gtt pages Matthew Auld
2017-09-29 16:10 ` [PATCH 12/21] drm/i915: support 2M pages for the 48b PPGTT Matthew Auld
2017-10-05 15:18 [PATCH 00/21] huge gtt pages Matthew Auld
2017-10-05 15:19 ` [PATCH 12/21] drm/i915: support 2M pages for the 48b PPGTT Matthew Auld
2017-10-06 14:50 [PATCH 00/21] huge gtt pages Matthew Auld
2017-10-06 14:50 ` [PATCH 12/21] drm/i915: support 2M pages for the 48b PPGTT 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=20170703141503.12609-13-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).