Skip to contentSkip to conversation

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

PATCH Applied Dave Gordon 4 participants 6 messages Apr 22, 2016 – Apr 25, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.)

---
 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(-)
drivers/gpu/drm/i915/i915_drv.h +1 -1
index 6f1e0f1..d69170b 100644
@@ -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
index 261a3ef..1dd5523 100644
@@ -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;
 
drivers/gpu/drm/i915/i915_gem_batch_pool.c +1 -1
index 7bf2f3f..1bc46ba 100644
@@ -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);
 
drivers/gpu/drm/i915/i915_gem_context.c +1 -1
index e5acc39..4e12bae 100644
@@ -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);
 
drivers/gpu/drm/i915/i915_gem_render_state.c +1 -1
index 71611bf..65c9dad 100644
@@ -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;
 
drivers/gpu/drm/i915/i915_guc_submission.c +1 -1
index d40c13f..72d6665 100644
@@ -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;
 
drivers/gpu/drm/i915/intel_display.c +1 -1
index ff60241..b7cb632 100644
@@ -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);
drivers/gpu/drm/i915/intel_fbdev.c +1 -1
index 79ac202..af56154 100644
@@ -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;
drivers/gpu/drm/i915/intel_lrc.c +2 -2
index 6179b59..2b7e6bb 100644
@@ -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;
drivers/gpu/drm/i915/intel_overlay.c +1 -1
index bcc3b6a..597fbcd 100644
@@ -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;
drivers/gpu/drm/i915/intel_ringbuffer.c +5 -5
index 245386e..892757e 100644
@@ -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;
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

✗ Fi.CI.BAT: warning for drm/i915: rename i915_gem_alloc_object() to i915_gem_object_create()

== Series Details ==

== Series Details ==

Series: drm/i915: rename i915_gem_alloc_object() to i915_gem_object_create()
URL : https://patchwork.freedesktop.org/series/6183/
State : warning

== Summary ==

Series 6183v1 drm/i915: rename i915_gem_alloc_object() to i915_gem_object_create()
http://patchwork.freedesktop.org/api/1.0/series/6183/revisions/1/mbox/

Test kms_force_connector_basic:

        Subgroup force-connector-state:
                pass       -> SKIP       (snb-dellxps)
bdw-ultra        total:193  pass:170  dwarn:0   dfail:0   fail:0   skip:23 
bsw-nuc-2        total:192  pass:153  dwarn:0   dfail:0   fail:0   skip:39 
byt-nuc          total:192  pass:154  dwarn:0   dfail:0   fail:0   skip:38 
ilk-hp8440p      total:193  pass:136  dwarn:0   dfail:0   fail:0   skip:57 
ivb-t430s        total:193  pass:165  dwarn:0   dfail:0   fail:0   skip:28 
skl-i7k-2        total:193  pass:168  dwarn:0   dfail:0   fail:0   skip:25 
skl-nuci5        total:193  pass:182  dwarn:0   dfail:0   fail:0   skip:11 
snb-dellxps      total:193  pass:154  dwarn:0   dfail:0   fail:0   skip:39 

Results at /archive/results/CI_IGT_test/Patchwork_2034/

340c485ad98d0ec0369a3b18d4a09938f3f5537d drm-intel-nightly: 2016y-04m-22d-17h-32m-25s UTC integration manifest 1abe1e4 drm/i915: rename i915_gem_alloc_object() to i915_gem_object_create()

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw

Re: ✗ Fi.CI.BAT: warning for drm/i915: rename i915_gem_alloc_object() to i915_gem_object_create()

Quoted 6 lines · Patchwork

== Series Details ==

Series: drm/i915: rename i915_gem_alloc_object() to i915_gem_object_create()
URL : https://patchwork.freedesktop.org/series/6183/
State : warning

Quoted 8 lines

== Summary ==

Series 6183v1 drm/i915: rename i915_gem_alloc_object() to i915_gem_object_create()
http://patchwork.freedesktop.org/api/1.0/series/6183/revisions/1/mbox/

Test kms_force_connector_basic:

         Subgroup force-connector-state:
                 pass       -> SKIP       (snb-dellxps)

The phantom VGA connector strikes again!

Quoted 9 lines
bdw-ultra        total:193  pass:170  dwarn:0   dfail:0   fail:0   skip:23
bsw-nuc-2        total:192  pass:153  dwarn:0   dfail:0   fail:0   skip:39
byt-nuc          total:192  pass:154  dwarn:0   dfail:0   fail:0   skip:38
ilk-hp8440p      total:193  pass:136  dwarn:0   dfail:0   fail:0   skip:57
ivb-t430s        total:193  pass:165  dwarn:0   dfail:0   fail:0   skip:28
skl-i7k-2        total:193  pass:168  dwarn:0   dfail:0   fail:0   skip:25
skl-nuci5        total:193  pass:182  dwarn:0   dfail:0   fail:0   skip:11
snb-dellxps      total:193  pass:154  dwarn:0   dfail:0   fail:0   skip:39
Quoted 5 lines

Results at /archive/results/CI_IGT_test/Patchwork_2034/

340c485ad98d0ec0369a3b18d4a09938f3f5537d drm-intel-nightly: 2016y-04m-22d-17h-32m-25s UTC integration manifest 1abe1e4 drm/i915: rename i915_gem_alloc_object() to i915_gem_object_create()

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

Re: ✗ Fi.CI.BAT: warning for drm/i915: rename i915_gem_alloc_object() to i915_gem_object_create()

Quoted 14 lines · Dave Gordon
Quoted 13 lines · Patchwork

== Series Details ==

Series: drm/i915: rename i915_gem_alloc_object() to i915_gem_object_create()
URL : https://patchwork.freedesktop.org/series/6183/
State : warning

== Summary ==

Series 6183v1 drm/i915: rename i915_gem_alloc_object() to i915_gem_object_create()
http://patchwork.freedesktop.org/api/1.0/series/6183/revisions/1/mbox/

Quoted 29 lines
Quoted 3 lines

Test kms_force_connector_basic:

         Subgroup force-connector-state:
                 pass       -> SKIP       (snb-dellxps)

The phantom VGA connector strikes again!

Quoted 23 lines

bdw-ultra total:193 pass:170 dwarn:0 dfail:0 fail:0
skip:23
bsw-nuc-2 total:192 pass:153 dwarn:0 dfail:0 fail:0
skip:39
byt-nuc total:192 pass:154 dwarn:0 dfail:0 fail:0
skip:38
ilk-hp8440p total:193 pass:136 dwarn:0 dfail:0 fail:0
skip:57
ivb-t430s total:193 pass:165 dwarn:0 dfail:0 fail:0
skip:28
skl-i7k-2 total:193 pass:168 dwarn:0 dfail:0 fail:0
skip:25
skl-nuci5 total:193 pass:182 dwarn:0 dfail:0 fail:0
skip:11
snb-dellxps total:193 pass:154 dwarn:0 dfail:0 fail:0
skip:39

Results at /archive/results/CI_IGT_test/Patchwork_2034/

340c485ad98d0ec0369a3b18d4a09938f3f5537d drm-intel-nightly:
2016y-04m-22d-17h-32m-25s UTC integration manifest 1abe1e4 drm/i915: rename i915_gem_alloc_object() to i915_gem_object_create()

Merged, thanks for the patch and reviews!

Regards,

Tvrtko

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

maintainer Reviewed-by on v1 1/1
#4 lore raw
In reply to Dave Gordon
Quoted 33 lines · Dave Gordon

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.)

---
 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(-)
drivers/gpu/drm/i915/i915_drv.h +1 -1
index 6f1e0f1..d69170b 100644
@@ -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);
Quoted 2 lines

 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!

Quoted 190 lines
drivers/gpu/drm/i915/i915_gem.c +0 -0
index 261a3ef..1dd5523 100644
@@ -381,7 +381,7 @@ void i915_gem_object_free(struct drm_i915_gem_object *obj)
  		return -EINVAL;


  /* Allocate the new object */

drivers/gpu/drm/i915/i915_gem.c +1 -1
-	obj = i915_gem_alloc_object(dev, size);
+	obj = i915_gem_object_create(dev, size);

  if (obj == NULL)
  return -ENOMEM;

drivers/gpu/drm/i915/i915_gem.c +0 -0
@@ -4492,7 +4492,7 @@ void i915_gem_object_init(struct drm_i915_gem_object *obj,
  	.put_pages = i915_gem_object_put_pages_gtt,
  };

drivers/gpu/drm/i915/i915_gem.c +1 -1
-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;

drivers/gpu/drm/i915/i915_gem.c +0 -0
@@ -5361,7 +5361,7 @@ struct drm_i915_gem_object *
  	size_t bytes;
  	int ret;

drivers/gpu/drm/i915/i915_gem.c +1 -1
-	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 +0 -0
index 7bf2f3f..1bc46ba 100644
@@ -134,7 +134,7 @@ struct drm_i915_gem_object *
  	if (obj == NULL) {
  		int ret;

drivers/gpu/drm/i915/i915_gem_batch_pool.c +1 -1
-		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 +0 -0
index e5acc39..4e12bae 100644
@@ -178,7 +178,7 @@ struct drm_i915_gem_object *
  	struct drm_i915_gem_object *obj;
  	int ret;

drivers/gpu/drm/i915/i915_gem_context.c +1 -1
-	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 +0 -0
index 71611bf..65c9dad 100644
@@ -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;

drivers/gpu/drm/i915/i915_gem_render_state.c +1 -1
-	so->obj = i915_gem_alloc_object(dev, 4096);
+	so->obj = i915_gem_object_create(dev, 4096);

  if (so->obj == NULL)
  return -ENOMEM;

drivers/gpu/drm/i915/i915_guc_submission.c +0 -0
index d40c13f..72d6665 100644
@@ -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;

drivers/gpu/drm/i915/i915_guc_submission.c +1 -1
-	obj = i915_gem_alloc_object(dev, size);
+	obj = i915_gem_object_create(dev, size);

  if (!obj)
  return NULL;

drivers/gpu/drm/i915/intel_display.c +0 -0
index ff60241..b7cb632 100644
@@ -10318,7 +10318,7 @@ struct drm_framebuffer *
  	struct drm_i915_gem_object *obj;
  	struct drm_mode_fb_cmd2 mode_cmd = { 0 };

drivers/gpu/drm/i915/intel_display.c +1 -1
-	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);

drivers/gpu/drm/i915/intel_fbdev.c +1 -1
index 79ac202..af56154 100644
@@ -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;
drivers/gpu/drm/i915/intel_lrc.c +0 -0
index 6179b59..2b7e6bb 100644
@@ -1472,7 +1472,7 @@ static int lrc_setup_wa_ctx_obj(struct intel_engine_cs *engine, u32 size)
  {
  	int ret;

drivers/gpu/drm/i915/intel_lrc.c +1 -1
-	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");

drivers/gpu/drm/i915/intel_lrc.c +0 -0
@@ -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;

drivers/gpu/drm/i915/intel_lrc.c +1 -1
-	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;

drivers/gpu/drm/i915/intel_overlay.c +1 -1
index bcc3b6a..597fbcd 100644
@@ -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;
drivers/gpu/drm/i915/intel_ringbuffer.c +0 -0
index 245386e..892757e 100644
@@ -671,7 +671,7 @@ static int init_ring_common(struct intel_engine_cs *engine)


  WARN_ON(engine->scratch.obj);

drivers/gpu/drm/i915/intel_ringbuffer.c +1 -1
-	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;

drivers/gpu/drm/i915/intel_ringbuffer.c +0 -0
@@ -2022,7 +2022,7 @@ static int init_status_page(struct intel_engine_cs *engine)
  		unsigned flags;
  		int ret;

drivers/gpu/drm/i915/intel_ringbuffer.c +1 -1
-		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;

drivers/gpu/drm/i915/intel_ringbuffer.c +1 -1
@@ -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;

drivers/gpu/drm/i915/intel_ringbuffer.c +0 -0
@@ -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)) {

drivers/gpu/drm/i915/intel_ringbuffer.c +1 -1
-			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;

drivers/gpu/drm/i915/intel_ringbuffer.c +0 -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)) {

drivers/gpu/drm/i915/intel_ringbuffer.c +1 -1
-		obj = i915_gem_alloc_object(dev, I830_WA_SIZE);
+		obj = i915_gem_object_create(dev, I830_WA_SIZE);
Quoted 3 lines

  if (obj == NULL) {
  DRM_ERROR("Failed to allocate batch bo\n"); return -ENOMEM;

Mechanical change, so

Signature · 7 lines
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/1
#5 lore raw
In reply to Dave Gordon
Quoted 221 lines · Dave Gordon

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.)

---
  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(-)
drivers/gpu/drm/i915/i915_drv.h +1 -1
index 6f1e0f1..d69170b 100644
@@ -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
index 261a3ef..1dd5523 100644
@@ -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;
 
drivers/gpu/drm/i915/i915_gem_batch_pool.c +1 -1
index 7bf2f3f..1bc46ba 100644
@@ -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);
 
drivers/gpu/drm/i915/i915_gem_context.c +1 -1
index e5acc39..4e12bae 100644
@@ -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);
 
drivers/gpu/drm/i915/i915_gem_render_state.c +1 -1
index 71611bf..65c9dad 100644
@@ -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;
 
drivers/gpu/drm/i915/i915_guc_submission.c +1 -1
index d40c13f..72d6665 100644
@@ -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;
 
drivers/gpu/drm/i915/intel_display.c +1 -1
index ff60241..b7cb632 100644
@@ -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);
drivers/gpu/drm/i915/intel_fbdev.c +1 -1
index 79ac202..af56154 100644
@@ -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;
drivers/gpu/drm/i915/intel_lrc.c +2 -2
index 6179b59..2b7e6bb 100644
@@ -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;
drivers/gpu/drm/i915/intel_overlay.c +1 -1
index bcc3b6a..597fbcd 100644
@@ -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;
drivers/gpu/drm/i915/intel_ringbuffer.c +4 -4
index 245386e..892757e 100644
@@ -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;

drivers/gpu/drm/i915/intel_ringbuffer.c int intel_init_render_ring_buffer(struct drm_device *dev) · line 2891

Quoted 8 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +1 -1
@@ -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;

Makes sense,

Regards,

Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx