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

Commit 89c8233f authored by David Herrmann's avatar David Herrmann Committed by Dave Airlie
Browse files

drm/gem: simplify object initialization 



drm_gem_object_init() and drm_gem_private_object_init() do exactly the
same (except for shmem alloc) so make the first use the latter to reduce
code duplication.

Also drop the return code from drm_gem_private_object_init(). It seems
unlikely that we will extend it any time soon so no reason to keep it
around. This simplifies code paths in drivers, too.

Last but not least, fix gma500 to call drm_gem_object_release() before
freeing objects that were allocated via drm_gem_private_object_init().
That isn't actually necessary for now, but might be in the future.

Signed-off-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
Acked-by: default avatarRob Clark <robdclark@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@gmail.com>
parent 23367ff4

drivers/gpu/drm/drm_gem.c

+8 −12
Original line number Diff line number Diff line
@@ -132,16 +132,14 @@ drm_gem_destroy(struct drm_device *dev) 
int drm_gem_object_init(struct drm_device *dev,

			struct drm_gem_object *obj, size_t size)

{

	BUG_ON((size & (PAGE_SIZE - 1)) != 0);

	struct file *filp;



	obj->dev = dev;

	obj->filp = shmem_file_setup("drm mm object", size, VM_NORESERVE);

	if (IS_ERR(obj->filp))

		return PTR_ERR(obj->filp);

	filp = shmem_file_setup("drm mm object", size, VM_NORESERVE);

	if (IS_ERR(filp))

		return PTR_ERR(filp);



	kref_init(&obj->refcount);

	atomic_set(&obj->handle_count, 0);

	obj->size = size;

	drm_gem_private_object_init(dev, obj, size);

	obj->filp = filp;



	return 0;

}
@@ -152,7 +150,7 @@ EXPORT_SYMBOL(drm_gem_object_init); 
 * no GEM provided backing store. Instead the caller is responsible for

 * backing the object and handling it.

 */

int drm_gem_private_object_init(struct drm_device *dev,

void drm_gem_private_object_init(struct drm_device *dev,

				 struct drm_gem_object *obj, size_t size)

{

	BUG_ON((size & (PAGE_SIZE - 1)) != 0);
@@ -163,8 +161,6 @@ int drm_gem_private_object_init(struct drm_device *dev, 
	kref_init(&obj->refcount);

	atomic_set(&obj->handle_count, 0);

	obj->size = size;



	return 0;

}

EXPORT_SYMBOL(drm_gem_private_object_init);

drivers/gpu/drm/gma500/framebuffer.c

+2 −4
Original line number Diff line number Diff line
@@ -321,10 +321,8 @@ static struct gtt_range *psbfb_alloc(struct drm_device *dev, int aligned_size) 
	/* Begin by trying to use stolen memory backing */

	backing = psb_gtt_alloc_range(dev, aligned_size, "fb", 1);

	if (backing) {

		if (drm_gem_private_object_init(dev,

					&backing->gem, aligned_size) == 0)

		drm_gem_private_object_init(dev, &backing->gem, aligned_size);

		return backing;

		psb_gtt_free_range(dev, backing);

	}

	return NULL;

}

drivers/gpu/drm/gma500/gem.c

+4 −3
Original line number Diff line number Diff line
@@ -261,11 +261,12 @@ static int psb_gem_create_stolen(struct drm_file *file, struct drm_device *dev, 
	struct gtt_range *gtt = psb_gtt_alloc_range(dev, size, "gem", 1);

	if (gtt == NULL)

		return -ENOMEM;

	if (drm_gem_private_object_init(dev, &gtt->gem, size) != 0)

		goto free_gtt;



	drm_gem_private_object_init(dev, &gtt->gem, size);

	if (drm_gem_handle_create(file, &gtt->gem, handle) == 0)

		return 0;

free_gtt:



	drm_gem_object_release(&gtt->gem);

	psb_gtt_free_range(dev, gtt);

	return -ENOMEM;

}

drivers/gpu/drm/i915/i915_gem_dmabuf.c

+1 −6
Original line number Diff line number Diff line
@@ -289,12 +289,7 @@ struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev, 
		goto fail_detach;

	}



	ret = drm_gem_private_object_init(dev, &obj->base, dma_buf->size);

	if (ret) {

		i915_gem_object_free(obj);

		goto fail_detach;

	}



	drm_gem_private_object_init(dev, &obj->base, dma_buf->size);

	i915_gem_object_init(obj, &i915_gem_object_dmabuf_ops);

	obj->base.import_attach = attach;

drivers/gpu/drm/i915/i915_gem_stolen.c

+1 −3
Original line number Diff line number Diff line
@@ -291,9 +291,7 @@ _i915_gem_object_create_stolen(struct drm_device *dev, 
	if (obj == NULL)

		return NULL;



	if (drm_gem_private_object_init(dev, &obj->base, stolen->size))

		goto cleanup;



	drm_gem_private_object_init(dev, &obj->base, stolen->size);

	i915_gem_object_init(obj, &i915_gem_object_stolen_ops);



	obj->pages = i915_pages_create_for_stolen(dev,