[PATCH v2 4/4] drm/i915/stolen: actually mark as contiguous
Tvrtko Ursulin
tvrtko.ursulin at linux.intel.com
Wed Apr 21 14:28:15 UTC 2021
On 21/04/2021 11:46, Matthew Auld wrote:
> Stolen memory is always allocated as physically contiguous pages, so
> mark the object flags as such. It looks like the flags were previously
> just ignored so this had no effect. In the future we might to add the
> proper plumbing for passing the flags all over the way down from the
> caller, but for now we don't have a use for that.
>
> Signed-off-by: Matthew Auld <matthew.auld at intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin at linux.intel.com>
> ---
> drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 12 +++++++++---
> 1 file changed, 9 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 b43929da8de8..c5b64b2400e8 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
> @@ -637,10 +637,17 @@ static int __i915_gem_object_create_stolen(struct intel_memory_region *mem,
> {
> static struct lock_class_key lock_class;
> unsigned int cache_level;
> + unsigned int flags;
> int err;
>
> + /*
> + * Stolen objects are always physically contiguous since we just
> + * allocate one big block underneath using the drm_mm range allocator.
> + */
> + flags = I915_BO_ALLOC_CONTIGUOUS;
> +
> drm_gem_private_object_init(&mem->i915->drm, &obj->base, stolen->size);
> - i915_gem_object_init(obj, &i915_gem_object_stolen_ops, &lock_class, 0);
> + i915_gem_object_init(obj, &i915_gem_object_stolen_ops, &lock_class, flags);
>
> obj->stolen = stolen;
> obj->read_domains = I915_GEM_DOMAIN_CPU | I915_GEM_DOMAIN_GTT;
> @@ -699,8 +706,7 @@ struct drm_i915_gem_object *
> i915_gem_object_create_stolen(struct drm_i915_private *i915,
> resource_size_t size)
> {
> - return i915_gem_object_create_region(i915->mm.stolen_region,
> - size, I915_BO_ALLOC_CONTIGUOUS);
> + return i915_gem_object_create_region(i915->mm.stolen_region, size, 0);
> }
>
> static int init_stolen_smem(struct intel_memory_region *mem)
>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
Regards,
Tvrtko
More information about the dri-devel
mailing list