[Intel-gfx] [PATCH 13/15] drm/i915: enable platform support for 64K pages

[Matthew Auld]

For gen9+ enable platform level support for 64K 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                  | 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 7caccb5bf963..0a6940c3841d 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -354,14 +354,16 @@ static const struct intel_device_info 
intel_cherryview_info = {
        .has_aliasing_ppgtt = 1,
        .has_full_ppgtt = 1,
        .display_mmio_offset = VLV_DISPLAY_BASE,
-       GEN_DEFAULT_PAGE_SIZES,
+       .page_size_mask = I915_GTT_PAGE_SIZE_4K |
+                         I915_GTT_PAGE_SIZE_64K,
        GEN_CHV_PIPEOFFSETS,
        CURSOR_OFFSETS,
        CHV_COLORS,
 };
 
 #define GEN9_DEFAULT_PAGE_SIZES \
-       .page_size_mask = I915_GTT_PAGE_SIZE_4K
+       .page_size_mask = I915_GTT_PAGE_SIZE_4K | \
+                         I915_GTT_PAGE_SIZE_64K
 
 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 bb12e6fe24ec..14e5b11312a7 100644
--- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
@@ -148,7 +148,8 @@ struct drm_i915_private *mock_gem_device(void)
        mkwrite_device_info(i915)->gen = -1;
 
        mkwrite_device_info(i915)->page_size_mask =
-               I915_GTT_PAGE_SIZE_4K;
+               I915_GTT_PAGE_SIZE_4K |
+               I915_GTT_PAGE_SIZE_64K;
 
        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