Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a883241c authored by Matthew Auld's avatar Matthew Auld Committed by Chris Wilson
Browse files

drm/i915: enable platform support for 2M pages 



For gen8+ platforms which support the 48b PPGTT, enable platform level
support for 2M pages. Also enable for mock testing.

Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20171006145041.21673-22-matthew.auld@intel.com


Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20171006221833.32439-21-chris@chris-wilson.co.uk
parent f1f3f982

drivers/gpu/drm/i915/i915_pci.c

+4 −2
Original line number Diff line number Diff line
@@ -376,7 +376,8 @@ static const struct intel_device_info intel_haswell_gt3_info __initconst = { 
#define GEN8_FEATURES \

	G75_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, \
@@ -437,7 +438,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 GEN9_FEATURES \

	GEN8_FEATURES, \

drivers/gpu/drm/i915/selftests/mock_gem_device.c

+2 −1
Original line number Diff line number Diff line
@@ -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);