Commit 9b78b5da authored by Matthew Auld's avatar Matthew Auld
Browse files

drm/i915: add i915_gem_object_create_region_at() 



Add a generic interface for allocating an object at some specific
offset, and convert stolen over. Later we will want to hook this up to
different backends.

Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: default avatarNirmoy Das <nirmoy.das@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220315181425.576828-4-matthew.auld@intel.com
parent d511d013

drivers/gpu/drm/i915/display/intel_plane_initial.c

+3 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * Copyright © 2021 Intel Corporation

 */



#include "gem/i915_gem_region.h"

#include "i915_drv.h"

#include "intel_atomic_plane.h"

#include "intel_display.h"
@@ -69,7 +70,8 @@ initial_plane_vma(struct drm_i915_private *i915, 
	    size * 2 > i915->stolen_usable_size)

		return NULL;



	obj = i915_gem_object_create_stolen_for_preallocated(i915, base, size);

	obj = i915_gem_object_create_region_at(i915->mm.stolen_region,

					       base, size, 0);

	if (IS_ERR(obj))

		return NULL;

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

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ __i915_gem_object_create_user_ext(struct drm_i915_private *i915, u64 size, 
	 */

	flags = I915_BO_ALLOC_USER;



	ret = mr->ops->init_object(mr, obj, size, 0, flags);

	ret = mr->ops->init_object(mr, obj, I915_BO_INVALID_OFFSET, size, 0, flags);

	if (ret)

		goto object_free;

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

+41 −6
Original line number Diff line number Diff line
@@ -27,8 +27,9 @@ void i915_gem_object_release_memory_region(struct drm_i915_gem_object *obj) 
	mutex_unlock(&mem->objects.lock);

}



struct drm_i915_gem_object *

i915_gem_object_create_region(struct intel_memory_region *mem,

static struct drm_i915_gem_object *

__i915_gem_object_create_region(struct intel_memory_region *mem,

				resource_size_t offset,

				resource_size_t size,

				resource_size_t page_size,

				unsigned int flags)
@@ -86,7 +87,7 @@ i915_gem_object_create_region(struct intel_memory_region *mem, 
	if (default_page_size < mem->min_page_size)

		flags |= I915_BO_ALLOC_PM_EARLY;



	err = mem->ops->init_object(mem, obj, size, page_size, flags);

	err = mem->ops->init_object(mem, obj, offset, size, page_size, flags);

	if (err)

		goto err_object_free;
@@ -98,6 +99,40 @@ i915_gem_object_create_region(struct intel_memory_region *mem, 
	return ERR_PTR(err);

}



struct drm_i915_gem_object *

i915_gem_object_create_region(struct intel_memory_region *mem,

			      resource_size_t size,

			      resource_size_t page_size,

			      unsigned int flags)

{

	return __i915_gem_object_create_region(mem, I915_BO_INVALID_OFFSET,

					       size, page_size, flags);

}



struct drm_i915_gem_object *

i915_gem_object_create_region_at(struct intel_memory_region *mem,

				 resource_size_t offset,

				 resource_size_t size,

				 unsigned int flags)

{

	GEM_BUG_ON(offset == I915_BO_INVALID_OFFSET);



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

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

		return ERR_PTR(-EINVAL);



	if (range_overflows(offset, size, resource_size(&mem->region)))

		return ERR_PTR(-EINVAL);



	if (!(flags & I915_BO_ALLOC_GPU_ONLY) &&

	    offset + size > mem->io_size &&

	    !i915_ggtt_has_aperture(to_gt(mem->i915)->ggtt))

		return ERR_PTR(-ENOSPC);



	return __i915_gem_object_create_region(mem, offset, size, 0,

					       flags | I915_BO_ALLOC_CONTIGUOUS);

}



/**

 * i915_gem_process_region - Iterate over all objects of a region using ops

 * to process and optionally skip objects

drivers/gpu/drm/i915/gem/i915_gem_region.h

+7 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ struct sg_table; 


struct i915_gem_apply_to_region;



#define I915_BO_INVALID_OFFSET ((resource_size_t)-1)



/**

 * struct i915_gem_apply_to_region_ops - ops to use when iterating over all

 * region objects.
@@ -56,6 +58,11 @@ i915_gem_object_create_region(struct intel_memory_region *mem, 
			      resource_size_t size,

			      resource_size_t page_size,

			      unsigned int flags);

struct drm_i915_gem_object *

i915_gem_object_create_region_at(struct intel_memory_region *mem,

				 resource_size_t offset,

				 resource_size_t size,

				 unsigned int flags);



int i915_gem_process_region(struct intel_memory_region *mr,

			    struct i915_gem_apply_to_region *apply);

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

+1 −0
Original line number Diff line number Diff line
@@ -552,6 +552,7 @@ static int __create_shmem(struct drm_i915_private *i915, 


static int shmem_object_init(struct intel_memory_region *mem,

			     struct drm_i915_gem_object *obj,

			     resource_size_t offset,

			     resource_size_t size,

			     resource_size_t page_size,

			     unsigned int flags)