From: Matthew Auld <matthew.auld@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 21/21] drm/i915: enable platform support for 2M pages
Date: Fri, 22 Sep 2017 18:32:52 +0100 [thread overview]
Message-ID: <20170922173252.10137-22-matthew.auld@intel.com> (raw)
In-Reply-To: <20170922173252.10137-1-matthew.auld@intel.com>
For gen8+ platforms which support the 48b PPGTT, enable platform level
support for 2M pages. Also enable for mock testing.
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_pci.c | 6 ++++--
drivers/gpu/drm/i915/selftests/mock_gem_device.c | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 9da69cb55302..ad07f7075f29 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -374,7 +374,8 @@ static const struct intel_device_info intel_haswell_gt3_info __initconst = {
#define BDW_FEATURES \
HSW_FEATURES, \
BDW_COLORS, \
- GEN_DEFAULT_PAGE_SIZES, \
+ .page_sizes = I915_GTT_PAGE_SIZE_4K | \
+ I915_GTT_PAGE_SIZE_2M, \
.has_logical_ring_contexts = 1, \
.has_full_48bit_ppgtt = 1, \
.has_64bit_reloc = 1, \
@@ -435,7 +436,8 @@ static const struct intel_device_info intel_cherryview_info __initconst = {
#define GEN9_DEFAULT_PAGE_SIZES \
.page_sizes = I915_GTT_PAGE_SIZE_4K | \
- I915_GTT_PAGE_SIZE_64K
+ I915_GTT_PAGE_SIZE_64K | \
+ I915_GTT_PAGE_SIZE_2M
#define SKL_PLATFORM \
BDW_FEATURES, \
diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
index 8a5a42ea1c98..39556a5979d4 100644
--- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
@@ -176,7 +176,8 @@ struct drm_i915_private *mock_gem_device(void)
mkwrite_device_info(i915)->page_sizes =
I915_GTT_PAGE_SIZE_4K |
- I915_GTT_PAGE_SIZE_64K;
+ I915_GTT_PAGE_SIZE_64K |
+ I915_GTT_PAGE_SIZE_2M;
spin_lock_init(&i915->mm.object_stat_lock);
mock_uncore_init(i915);
--
2.13.5
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-09-22 17:34 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-22 17:32 [PATCH 00/21] huge gtt pages Matthew Auld
2017-09-22 17:32 ` [PATCH 01/21] mm/shmem: introduce shmem_file_setup_with_mnt Matthew Auld
2017-09-22 17:32 ` [PATCH 02/21] drm/i915: introduce simple gemfs Matthew Auld
2017-09-23 8:36 ` Chris Wilson
2017-09-25 18:06 ` Chris Wilson
2017-09-22 17:32 ` [PATCH 03/21] drm/i915/gemfs: enable THP Matthew Auld
2017-09-22 17:32 ` [PATCH 04/21] drm/i915: introduce page_sizes field to dev_info Matthew Auld
2017-09-23 8:39 ` Chris Wilson
2017-09-22 17:32 ` [PATCH 05/21] drm/i915: push set_pages down to the callers Matthew Auld
2017-09-23 8:41 ` Chris Wilson
2017-09-22 17:32 ` [PATCH 06/21] drm/i915: introduce page_size members Matthew Auld
2017-09-23 8:42 ` Chris Wilson
2017-09-22 17:32 ` [PATCH 07/21] drm/i915: introduce vm set_pages/clear_pages Matthew Auld
2017-09-23 8:43 ` Chris Wilson
2017-09-22 17:32 ` [PATCH 08/21] drm/i915: align the vma start to the largest gtt page size Matthew Auld
2017-09-23 8:46 ` Chris Wilson
2017-09-22 17:32 ` [PATCH 09/21] drm/i915: align 64K objects to 2M Matthew Auld
2017-09-23 8:46 ` Chris Wilson
2017-09-22 17:32 ` [PATCH 10/21] drm/i915: enable IPS bit for 64K pages Matthew Auld
2017-09-26 12:20 ` Mika Kuoppala
2017-09-22 17:32 ` [PATCH 11/21] drm/i915: disable GTT cache for 2M pages Matthew Auld
2017-09-26 11:41 ` Mika Kuoppala
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-22 17:32 ` [PATCH 13/21] drm/i915: add support for 64K scratch page Matthew Auld
2017-09-23 8:52 ` Chris Wilson
2017-09-22 17:32 ` [PATCH 14/21] drm/i915: support 64K pages for the 48b PPGTT Matthew Auld
2017-09-23 8:53 ` Chris Wilson
2017-09-22 17:32 ` [PATCH 15/21] drm/i915: accurate page size tracking for the ppgtt Matthew Auld
2017-09-23 8:54 ` Chris Wilson
2017-09-22 17:32 ` [PATCH 16/21] drm/i915/debugfs: include some gtt page size metrics Matthew Auld
2017-09-23 8:56 ` Chris Wilson
2017-09-22 17:32 ` [PATCH 17/21] drm/i915/selftests: huge page tests Matthew Auld
2017-09-23 8:30 ` Chris Wilson
2017-09-22 17:32 ` [PATCH 18/21] drm/i915/selftests: mix huge pages Matthew Auld
2017-09-23 8:57 ` Chris Wilson
2017-09-22 17:32 ` [PATCH 19/21] drm/i915: disable platform support for vGPU huge gtt pages Matthew Auld
2017-09-22 18:12 ` Zhenyu Wang
2017-09-23 8:57 ` Chris Wilson
2017-09-22 17:32 ` [PATCH 20/21] drm/i915: enable platform support for 64K pages Matthew Auld
2017-09-23 8:58 ` Chris Wilson
2017-09-22 17:32 ` Matthew Auld [this message]
2017-09-23 8:58 ` [PATCH 21/21] drm/i915: enable platform support for 2M pages Chris Wilson
2017-09-22 18:20 ` ✓ Fi.CI.BAT: success for huge gtt pages (rev8) Patchwork
2017-09-22 22:33 ` ✗ Fi.CI.IGT: failure " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2017-09-29 16:10 [PATCH 00/21] huge gtt pages Matthew Auld
2017-09-29 16:10 ` [PATCH 21/21] drm/i915: enable platform support for 2M pages Matthew Auld
2017-10-05 15:18 [PATCH 00/21] huge gtt pages Matthew Auld
2017-10-05 15:19 ` [PATCH 21/21] drm/i915: enable platform support for 2M pages Matthew Auld
2017-10-06 14:50 [PATCH 00/21] huge gtt pages Matthew Auld
2017-10-06 14:50 ` [PATCH 21/21] drm/i915: enable platform support for 2M pages 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=20170922173252.10137-22-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).