Commit f9a7b01e authored by CQ Tang's avatar CQ Tang Committed by Matthew Auld
Browse files

drm/i915/stolen: enforce the min_page_size contract 



Since stolen can now be device local-memory underneath, we should try to
enforce any min_page_size restrictions when allocating pages.

Signed-off-by: default avatarCQ Tang <cq.tang@intel.com>
Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210421104658.304142-3-matthew.auld@intel.com
parent b75947e6

drivers/gpu/drm/i915/gem/i915_gem_stolen.c

+4 −3
Original line number Diff line number Diff line
@@ -677,7 +677,8 @@ static int _i915_gem_object_stolen_init(struct intel_memory_region *mem, 
	if (!stolen)

		return -ENOMEM;



	ret = i915_gem_stolen_insert_node(i915, stolen, size, 4096);

	ret = i915_gem_stolen_insert_node(i915, stolen, size,

					  mem->min_page_size);

	if (ret)

		goto err_free;
@@ -836,8 +837,8 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_i915_private *i915, 


	/* KISS and expect everything to be page-aligned */

	if (GEM_WARN_ON(size == 0) ||

	    GEM_WARN_ON(!IS_ALIGNED(size, I915_GTT_PAGE_SIZE)) ||

	    GEM_WARN_ON(!IS_ALIGNED(stolen_offset, I915_GTT_MIN_ALIGNMENT)))

	    GEM_WARN_ON(!IS_ALIGNED(size, mem->min_page_size)) ||

	    GEM_WARN_ON(!IS_ALIGNED(stolen_offset, mem->min_page_size)))

		return ERR_PTR(-EINVAL);



	stolen = kzalloc(sizeof(*stolen), GFP_KERNEL);