[Intel-gfx] [PATCH 15/15] drm/i915: enable platform support for 1G pages

[Matthew Auld]

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

Signed-off-by: Matthew Auld <matthew.a...@intel.com>
Cc: Joonas Lahtinen <joonas.lahti...@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 97d7e84f9893..8d8068083597 100644
--- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
@@ -150,7 +150,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