Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Matthew Auld <matthew.auld@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 17/17] drm/i915: enable platform support for 1G pages
Date: Tue, 16 May 2017 09:29:48 +0100	[thread overview]
Message-ID: <20170516082948.28090-18-matthew.auld@intel.com> (raw)
In-Reply-To: <20170516082948.28090-1-matthew.auld@intel.com>

For gen8+ enable platform level support for 1G pages. Also enable for
mock testing.

Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
---
 drivers/gpu/drm/i915/i915_pci.c                  | 9 ++++++---
 drivers/gpu/drm/i915/selftests/mock_gem_device.c | 3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 452f061fd7b3..68baefe6566c 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -320,7 +320,8 @@ static const struct intel_device_info intel_haswell_info = {
 	HSW_FEATURES, \
 	BDW_COLORS, \
 	.page_size_mask = I915_GTT_PAGE_SIZE_4K | \
-			  I915_GTT_PAGE_SIZE_2M, \
+			  I915_GTT_PAGE_SIZE_2M | \
+			  I915_GTT_PAGE_SIZE_1G, \
 	.has_logical_ring_contexts = 1, \
 	.has_full_48bit_ppgtt = 1, \
 	.has_64bit_reloc = 1
@@ -357,7 +358,8 @@ static const struct intel_device_info intel_cherryview_info = {
 	.display_mmio_offset = VLV_DISPLAY_BASE,
 	.page_size_mask = I915_GTT_PAGE_SIZE_4K |
 			  I915_GTT_PAGE_SIZE_64K |
-			  I915_GTT_PAGE_SIZE_2M,
+			  I915_GTT_PAGE_SIZE_2M |
+			  I915_GTT_PAGE_SIZE_1G,
 	GEN_CHV_PIPEOFFSETS,
 	CURSOR_OFFSETS,
 	CHV_COLORS,
@@ -366,7 +368,8 @@ static const struct intel_device_info intel_cherryview_info = {
 #define GEN9_DEFAULT_PAGE_SIZES \
 	.page_size_mask = I915_GTT_PAGE_SIZE_4K | \
 			  I915_GTT_PAGE_SIZE_64K | \
-			  I915_GTT_PAGE_SIZE_2M
+			  I915_GTT_PAGE_SIZE_2M | \
+			  I915_GTT_PAGE_SIZE_1G
 
 static const struct intel_device_info intel_skylake_info = {
 	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 23f0db2dbb5d..2535e211650c 100644
--- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
@@ -146,7 +146,8 @@ struct drm_i915_private *mock_gem_device(void)
 	mkwrite_device_info(i915)->page_size_mask =
 		I915_GTT_PAGE_SIZE_4K |
 		I915_GTT_PAGE_SIZE_64K |
-		I915_GTT_PAGE_SIZE_2M;
+		I915_GTT_PAGE_SIZE_2M |
+		I915_GTT_PAGE_SIZE_1G;
 
 	spin_lock_init(&i915->mm.object_stat_lock);
 	mock_uncore_init(i915);
-- 
2.9.4

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2017-05-16  8:30 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-16  8:29 [PATCH 00/17] add support for huge-gtt-pages Matthew Auld
2017-05-16  8:29 ` [PATCH 01/17] drm/i915: introduce page_size_mask to dev_info Matthew Auld
2017-05-16  8:29 ` [PATCH 02/17] drm/i915: introduce gtt page size Matthew Auld
2017-05-16  8:41   ` Chris Wilson
2017-05-16  9:59   ` Chris Wilson
2017-05-23 12:42     ` Matthew Auld
2017-05-23 12:54       ` Chris Wilson
2017-05-23 13:57         ` Matthew Auld
2017-05-23 14:30           ` Chris Wilson
2017-05-16  8:29 ` [PATCH 03/17] drm/i915: align the vma start to the " Matthew Auld
2017-05-16  8:40   ` Chris Wilson
2017-05-16  8:29 ` [PATCH 04/17] drm/i915: align 64K objects to 2M Matthew Auld
2017-05-16  8:29 ` [PATCH 05/17] drm/i915: fallback to normal pages on vma insert failure Matthew Auld
2017-05-16  8:39   ` Chris Wilson
2017-05-16  8:29 ` [PATCH 06/17] mm/shmem: expose driver overridable huge option Matthew Auld
2017-05-16 10:02   ` Kirill A. Shutemov
2017-05-16  8:29 ` [PATCH 07/17] drm/i915: request THP for shmem backed objects Matthew Auld
2017-05-16  8:29 ` [PATCH 08/17] drm/i915: pass gtt page size to insert_entries Matthew Auld
2017-05-16  8:29 ` [PATCH 09/17] drm/i915: enable IPS bit for 64K pages Matthew Auld
2017-05-16  8:29 ` [PATCH 10/17] drm/i915: support inserting 64K pages into the 48b PPGTT Matthew Auld
2017-05-16  8:29 ` [PATCH 11/17] drm/i915: disable GTT cache for 2M/1G pages Matthew Auld
2017-05-16 10:04   ` Ville Syrjälä
2017-05-16 10:11     ` Chris Wilson
2017-05-16  8:29 ` [PATCH 12/17] drm/i915: support inserting 2M pages into the 48b PPGTT Matthew Auld
2017-05-16  8:29 ` [PATCH 13/17] drm/i915: support inserting 1G " Matthew Auld
2017-05-16  8:29 ` [PATCH 14/17] drm/i915/debugfs: include some gtt_page_size metrics Matthew Auld
2017-05-19 10:48   ` Chris Wilson
2017-05-19 10:51   ` Chris Wilson
2017-05-16  8:29 ` [PATCH 15/17] drm/i915: enable platform support for 64K pages Matthew Auld
2017-05-16  8:29 ` [PATCH 16/17] drm/i915: enable platform support for 2M pages Matthew Auld
2017-05-16  8:29 ` Matthew Auld [this message]
2017-05-16  8:49 ` ✓ Fi.CI.BAT: success for add support for huge-gtt-pages 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=20170516082948.28090-18-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