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

Commit d37cd8a8 authored by Dave Gordon's avatar Dave Gordon Committed by Tvrtko Ursulin
Browse files

drm/i915: rename i915_gem_alloc_object() to i915_gem_object_create() 



Because having both i915_gem_object_alloc() and i915_gem_alloc_object()
(with different return conventions) is just too confusing!

(i915_gem_object_alloc() is the low-level memory allocator, and remains
unchanged, whereas i915_gem_alloc_object() is a constructor that ALSO
initialises the newly-allocated object.)

Signed-off-by: default avatarDave Gordon <david.s.gordon@intel.com>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1461348872-4702-1-git-send-email-david.s.gordon@intel.com
parent ee0629cf

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -2923,7 +2923,7 @@ void *i915_gem_object_alloc(struct drm_device *dev); 
void i915_gem_object_free(struct drm_i915_gem_object *obj);

void i915_gem_object_init(struct drm_i915_gem_object *obj,

			 const struct drm_i915_gem_object_ops *ops);

struct drm_i915_gem_object *i915_gem_alloc_object(struct drm_device *dev,

struct drm_i915_gem_object *i915_gem_object_create(struct drm_device *dev,

						  size_t size);

struct drm_i915_gem_object *i915_gem_object_create_from_data(

		struct drm_device *dev, const void *data, size_t size);

drivers/gpu/drm/i915/i915_gem.c

+3 −3
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ i915_gem_create(struct drm_file *file, 
		return -EINVAL;



	/* Allocate the new object */

	obj = i915_gem_alloc_object(dev, size);

	obj = i915_gem_object_create(dev, size);

	if (obj == NULL)

		return -ENOMEM;
@@ -4495,7 +4495,7 @@ static const struct drm_i915_gem_object_ops i915_gem_object_ops = { 
	.put_pages = i915_gem_object_put_pages_gtt,

};



struct drm_i915_gem_object *i915_gem_alloc_object(struct drm_device *dev,

struct drm_i915_gem_object *i915_gem_object_create(struct drm_device *dev,

						  size_t size)

{

	struct drm_i915_gem_object *obj;
@@ -5364,7 +5364,7 @@ i915_gem_object_create_from_data(struct drm_device *dev, 
	size_t bytes;

	int ret;



	obj = i915_gem_alloc_object(dev, round_up(size, PAGE_SIZE));

	obj = i915_gem_object_create(dev, round_up(size, PAGE_SIZE));

	if (IS_ERR_OR_NULL(obj))

		return obj;

drivers/gpu/drm/i915/i915_gem_batch_pool.c

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ i915_gem_batch_pool_get(struct i915_gem_batch_pool *pool, 
	if (obj == NULL) {

		int ret;



		obj = i915_gem_alloc_object(pool->dev, size);

		obj = i915_gem_object_create(pool->dev, size);

		if (obj == NULL)

			return ERR_PTR(-ENOMEM);

drivers/gpu/drm/i915/i915_gem_context.c

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ i915_gem_alloc_context_obj(struct drm_device *dev, size_t size) 
	struct drm_i915_gem_object *obj;

	int ret;



	obj = i915_gem_alloc_object(dev, size);

	obj = i915_gem_object_create(dev, size);

	if (obj == NULL)

		return ERR_PTR(-ENOMEM);

drivers/gpu/drm/i915/i915_gem_render_state.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static int render_state_init(struct render_state *so, struct drm_device *dev) 
	if (so->rodata->batch_items * 4 > 4096)

		return -EINVAL;



	so->obj = i915_gem_alloc_object(dev, 4096);

	so->obj = i915_gem_object_create(dev, 4096);

	if (so->obj == NULL)

		return -ENOMEM;