diff options
| author | CQ Tang <cq.tang@intel.com> | 2021-04-21 11:46:57 +0100 |
|---|---|---|
| committer | Matthew Auld <matthew.auld@intel.com> | 2021-04-22 08:50:18 +0100 |
| commit | f9a7b01e95d5e6c3f79f0efbbbbb2bbc52a8f3ce (patch) | |
| tree | 4d661a8d77062ad4abd10b4c70d55ab057434233 /drivers/gpu | |
| parent | b75947e6b29d5b33f79d7b3918747592534e3fb1 (diff) | |
| download | linux-stable-f9a7b01e95d5e6c3f79f0efbbbbb2bbc52a8f3ce.tar.gz linux-stable-f9a7b01e95d5e6c3f79f0efbbbbb2bbc52a8f3ce.tar.bz2 linux-stable-f9a7b01e95d5e6c3f79f0efbbbbb2bbc52a8f3ce.zip | |
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: CQ Tang <cq.tang@intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210421104658.304142-3-matthew.auld@intel.com
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c index 13a7932cfe1a..b43929da8de8 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c @@ -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); |