All of lore.kernel.org
 help / color / mirror / Atom feed
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
To: Dave Gordon <david.s.gordon@intel.com>, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: rename i915_gem_alloc_object() to i915_gem_object_create()
Date: Mon, 25 Apr 2016 13:46:03 +0300	[thread overview]
Message-ID: <1461581163.5848.4.camel@linux.intel.com> (raw)
In-Reply-To: <1461348872-4702-1-git-send-email-david.s.gordon@intel.com>

On pe, 2016-04-22 at 19:14 +0100, Dave Gordon wrote:
> 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: Dave Gordon <david.s.gordon@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.h              |  2 +-
>  drivers/gpu/drm/i915/i915_gem.c              |  6 +++---
>  drivers/gpu/drm/i915/i915_gem_batch_pool.c   |  2 +-
>  drivers/gpu/drm/i915/i915_gem_context.c      |  2 +-
>  drivers/gpu/drm/i915/i915_gem_render_state.c |  2 +-
>  drivers/gpu/drm/i915/i915_guc_submission.c   |  2 +-
>  drivers/gpu/drm/i915/intel_display.c         |  2 +-
>  drivers/gpu/drm/i915/intel_fbdev.c           |  2 +-
>  drivers/gpu/drm/i915/intel_lrc.c             |  4 ++--
>  drivers/gpu/drm/i915/intel_overlay.c         |  2 +-
>  drivers/gpu/drm/i915/intel_ringbuffer.c      | 10 +++++-----
>  11 files changed, 18 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 6f1e0f1..d69170b 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -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);

Nicely matches the i915_gem_object_create_from_data too!

> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 261a3ef..1dd5523 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -381,7 +381,7 @@ void i915_gem_object_free(struct drm_i915_gem_object *obj)
>  		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;
>  
> @@ -4492,7 +4492,7 @@ void i915_gem_object_init(struct drm_i915_gem_object *obj,
>  	.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;
> @@ -5361,7 +5361,7 @@ struct drm_i915_gem_object *
>  	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;
>  
> diff --git a/drivers/gpu/drm/i915/i915_gem_batch_pool.c b/drivers/gpu/drm/i915/i915_gem_batch_pool.c
> index 7bf2f3f..1bc46ba 100644
> --- a/drivers/gpu/drm/i915/i915_gem_batch_pool.c
> +++ b/drivers/gpu/drm/i915/i915_gem_batch_pool.c
> @@ -134,7 +134,7 @@ struct drm_i915_gem_object *
>  	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);
>  
> diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
> index e5acc39..4e12bae 100644
> --- a/drivers/gpu/drm/i915/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/i915_gem_context.c
> @@ -178,7 +178,7 @@ struct drm_i915_gem_object *
>  	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);
>  
> diff --git a/drivers/gpu/drm/i915/i915_gem_render_state.c b/drivers/gpu/drm/i915/i915_gem_render_state.c
> index 71611bf..65c9dad 100644
> --- a/drivers/gpu/drm/i915/i915_gem_render_state.c
> +++ b/drivers/gpu/drm/i915/i915_gem_render_state.c
> @@ -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;
>  
> diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c
> index d40c13f..72d6665 100644
> --- a/drivers/gpu/drm/i915/i915_guc_submission.c
> +++ b/drivers/gpu/drm/i915/i915_guc_submission.c
> @@ -587,7 +587,7 @@ static struct drm_i915_gem_object *gem_allocate_guc_obj(struct drm_device *dev,
>  	struct drm_i915_private *dev_priv = dev->dev_private;
>  	struct drm_i915_gem_object *obj;
>  
> -	obj = i915_gem_alloc_object(dev, size);
> +	obj = i915_gem_object_create(dev, size);
>  	if (!obj)
>  		return NULL;
>  
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index ff60241..b7cb632 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -10318,7 +10318,7 @@ struct drm_framebuffer *
>  	struct drm_i915_gem_object *obj;
>  	struct drm_mode_fb_cmd2 mode_cmd = { 0 };
>  
> -	obj = i915_gem_alloc_object(dev,
> +	obj = i915_gem_object_create(dev,
>  				    intel_framebuffer_size_for_mode(mode, bpp));
>  	if (obj == NULL)
>  		return ERR_PTR(-ENOMEM);
> diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
> index 79ac202..af56154 100644
> --- a/drivers/gpu/drm/i915/intel_fbdev.c
> +++ b/drivers/gpu/drm/i915/intel_fbdev.c
> @@ -150,7 +150,7 @@ static int intelfb_alloc(struct drm_fb_helper *helper,
>  	if (size * 2 < ggtt->stolen_usable_size)
>  		obj = i915_gem_object_create_stolen(dev, size);
>  	if (obj == NULL)
> -		obj = i915_gem_alloc_object(dev, size);
> +		obj = i915_gem_object_create(dev, size);
>  	if (!obj) {
>  		DRM_ERROR("failed to allocate framebuffer\n");
>  		ret = -ENOMEM;
> diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
> index 6179b59..2b7e6bb 100644
> --- a/drivers/gpu/drm/i915/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/intel_lrc.c
> @@ -1472,7 +1472,7 @@ static int lrc_setup_wa_ctx_obj(struct intel_engine_cs *engine, u32 size)
>  {
>  	int ret;
>  
> -	engine->wa_ctx.obj = i915_gem_alloc_object(engine->dev,
> +	engine->wa_ctx.obj = i915_gem_object_create(engine->dev,
>  						   PAGE_ALIGN(size));
>  	if (!engine->wa_ctx.obj) {
>  		DRM_DEBUG_DRIVER("alloc LRC WA ctx backing obj failed.\n");
> @@ -2665,7 +2665,7 @@ int intel_lr_context_deferred_alloc(struct intel_context *ctx,
>  	/* One extra page as the sharing data between driver and GuC */
>  	context_size += PAGE_SIZE * LRC_PPHWSP_PN;
>  
> -	ctx_obj = i915_gem_alloc_object(dev, context_size);
> +	ctx_obj = i915_gem_object_create(dev, context_size);
>  	if (!ctx_obj) {
>  		DRM_DEBUG_DRIVER("Alloc LRC backing obj failed.\n");
>  		return -ENOMEM;
> diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
> index bcc3b6a..597fbcd 100644
> --- a/drivers/gpu/drm/i915/intel_overlay.c
> +++ b/drivers/gpu/drm/i915/intel_overlay.c
> @@ -1396,7 +1396,7 @@ void intel_setup_overlay(struct drm_device *dev)
>  	if (!OVERLAY_NEEDS_PHYSICAL(dev))
>  		reg_bo = i915_gem_object_create_stolen(dev, PAGE_SIZE);
>  	if (reg_bo == NULL)
> -		reg_bo = i915_gem_alloc_object(dev, PAGE_SIZE);
> +		reg_bo = i915_gem_object_create(dev, PAGE_SIZE);
>  	if (reg_bo == NULL)
>  		goto out_free;
>  	overlay->reg_bo = reg_bo;
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> index 245386e..892757e 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -671,7 +671,7 @@ static int init_ring_common(struct intel_engine_cs *engine)
>  
>  	WARN_ON(engine->scratch.obj);
>  
> -	engine->scratch.obj = i915_gem_alloc_object(engine->dev, 4096);
> +	engine->scratch.obj = i915_gem_object_create(engine->dev, 4096);
>  	if (engine->scratch.obj == NULL) {
>  		DRM_ERROR("Failed to allocate seqno page\n");
>  		ret = -ENOMEM;
> @@ -2022,7 +2022,7 @@ static int init_status_page(struct intel_engine_cs *engine)
>  		unsigned flags;
>  		int ret;
>  
> -		obj = i915_gem_alloc_object(engine->dev, 4096);
> +		obj = i915_gem_object_create(engine->dev, 4096);
>  		if (obj == NULL) {
>  			DRM_ERROR("Failed to allocate status page\n");
>  			return -ENOMEM;
> @@ -2163,7 +2163,7 @@ static int intel_alloc_ringbuffer_obj(struct drm_device *dev,
>  	if (!HAS_LLC(dev))
>  		obj = i915_gem_object_create_stolen(dev, ringbuf->size);
>  	if (obj == NULL)
> -		obj = i915_gem_alloc_object(dev, ringbuf->size);
> +		obj = i915_gem_object_create(dev, ringbuf->size);
>  	if (obj == NULL)
>  		return -ENOMEM;
>  
> @@ -2776,7 +2776,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev)
>  
>  	if (INTEL_INFO(dev)->gen >= 8) {
>  		if (i915_semaphore_is_enabled(dev)) {
> -			obj = i915_gem_alloc_object(dev, 4096);
> +			obj = i915_gem_object_create(dev, 4096);
>  			if (obj == NULL) {
>  				DRM_ERROR("Failed to allocate semaphore bo. Disabling semaphores\n");
>  				i915.semaphores = 0;
> @@ -2885,7 +2885,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev)
>  
>  	/* Workaround batchbuffer to combat CS tlb bug. */
>  	if (HAS_BROKEN_CS_TLB(dev)) {
> -		obj = i915_gem_alloc_object(dev, I830_WA_SIZE);
> +		obj = i915_gem_object_create(dev, I830_WA_SIZE);
>  		if (obj == NULL) {
>  			DRM_ERROR("Failed to allocate batch bo\n");
>  			return -ENOMEM;

Mechanical change, so

Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

-- 
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2016-04-25 10:44 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-22 18:14 [PATCH] drm/i915: rename i915_gem_alloc_object() to i915_gem_object_create() Dave Gordon
2016-04-24  9:23 ` ✗ Fi.CI.BAT: warning for " Patchwork
2016-04-25  8:14   ` Dave Gordon
2016-04-25 11:37     ` Tvrtko Ursulin
2016-04-25 10:46 ` Joonas Lahtinen [this message]
2016-04-25 10:52 ` [PATCH] " Tvrtko Ursulin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1461581163.5848.4.camel@linux.intel.com \
    --to=joonas.lahtinen@linux.intel.com \
    --cc=david.s.gordon@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.