[PATCH 4/6] drm/i915: introduce & use i915_gem_object_unreference()
Dave Gordon
david.s.gordon at intel.com
Wed Jul 20 11:10:56 UTC 2016
To complement i915_gem_object_reference(), we obviously need a similar
i915-specific function to *release* a reference. Here it is ... and
strangely, there are a LOT more of these!
Coccinelle:
@unreference@
idexpression struct drm_i915_gem_object *OBJ;
@@
{
...
- drm_gem_object_unreference(&OBJ->base)
+ i915_gem_object_unreference(OBJ)
...
}
Signed-off-by: Dave Gordon <david.s.gordon at intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 6 ++++++
drivers/gpu/drm/i915/i915_gem.c | 26 +++++++++++++-------------
drivers/gpu/drm/i915/i915_gem_batch_pool.c | 4 ++--
drivers/gpu/drm/i915/i915_gem_context.c | 4 ++--
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 6 +++---
drivers/gpu/drm/i915/i915_gem_render_state.c | 4 ++--
drivers/gpu/drm/i915/i915_gem_shrinker.c | 2 +-
drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +-
drivers/gpu/drm/i915/i915_gem_tiling.c | 4 ++--
drivers/gpu/drm/i915/i915_gem_userptr.c | 4 ++--
drivers/gpu/drm/i915/i915_guc_submission.c | 6 +++---
drivers/gpu/drm/i915/intel_display.c | 6 +++---
drivers/gpu/drm/i915/intel_fbdev.c | 2 +-
drivers/gpu/drm/i915/intel_guc_loader.c | 4 ++--
drivers/gpu/drm/i915/intel_lrc.c | 6 +++---
drivers/gpu/drm/i915/intel_overlay.c | 6 +++---
drivers/gpu/drm/i915/intel_ringbuffer.c | 14 +++++++-------
17 files changed, 56 insertions(+), 50 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 4774ec9..4492570 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2305,8 +2305,14 @@ to_intel_bo(struct drm_gem_object *gem_obj)
BUILD_BUG_ON(offsetof(struct drm_i915_gem_object, base));
return container_of(gem_obj, struct drm_i915_gem_object, base);
}
+/*
+ * It is permitted to call i915_gem_object_unreference(NULL), to simplify
+ * cleanup code, but i915_gem_object_reference(NULL) will cause an OOPS.
+ */
#define i915_gem_object_reference(i915_obj) \
drm_gem_object_reference(to_gem_object(i915_obj))
+#define i915_gem_object_unreference(i915_obj) \
+ drm_gem_object_unreference(to_gem_object(i915_obj))
static inline bool
i915_gem_object_has_struct_page(const struct drm_i915_gem_object *obj)
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index ba245b0..eafb381 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -295,7 +295,7 @@ int i915_mutex_lock_interruptible(struct drm_device *dev)
break;
ret = i915_gem_object_put_pages(obj);
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
return ret;
}
@@ -887,7 +887,7 @@ int i915_gem_obj_prepare_shmem_read(struct drm_i915_gem_object *obj,
args->offset, args->data_ptr);
out:
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
unlock:
mutex_unlock(&dev->struct_mutex);
return ret;
@@ -1320,7 +1320,7 @@ int i915_gem_obj_prepare_shmem_read(struct drm_i915_gem_object *obj,
}
out:
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
unlock:
mutex_unlock(&dev->struct_mutex);
put_rpm:
@@ -1522,7 +1522,7 @@ static struct intel_rps_client *to_rps_client(struct drm_file *file)
intel_fb_obj_invalidate(obj, write_origin(obj, write_domain));
unref:
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
unlock:
mutex_unlock(&dev->struct_mutex);
return ret;
@@ -1556,7 +1556,7 @@ static struct intel_rps_client *to_rps_client(struct drm_file *file)
if (obj->pin_display)
i915_gem_object_flush_cpu_write_domain(obj);
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
unlock:
mutex_unlock(&dev->struct_mutex);
return ret;
@@ -1987,7 +1987,7 @@ static void i915_gem_object_free_mmap_offset(struct drm_i915_gem_object *obj)
*offset = drm_vma_node_offset_addr(&obj->base.vma_node);
out:
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
unlock:
mutex_unlock(&dev->struct_mutex);
return ret;
@@ -2411,7 +2411,7 @@ void i915_vma_move_to_active(struct i915_vma *vma,
}
i915_gem_request_assign(&obj->last_fenced_req, NULL);
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
}
static bool i915_context_is_banned(const struct i915_gem_context *ctx)
@@ -2814,7 +2814,7 @@ void i915_gem_retire_requests(struct drm_i915_private *dev_priv)
goto out;
}
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
for (i = 0; i < I915_NUM_ENGINES; i++) {
if (obj->last_read_req[i] == NULL)
@@ -2835,7 +2835,7 @@ void i915_gem_retire_requests(struct drm_i915_private *dev_priv)
return ret;
out:
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
mutex_unlock(&dev->struct_mutex);
return ret;
}
@@ -3665,7 +3665,7 @@ int i915_gem_set_caching_ioctl(struct drm_device *dev, void *data,
ret = i915_gem_object_set_cache_level(obj, level);
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
unlock:
mutex_unlock(&dev->struct_mutex);
rpm_put:
@@ -4057,7 +4057,7 @@ void __i915_vma_set_map_and_fenceable(struct i915_vma *vma)
}
unref:
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
unlock:
mutex_unlock(&dev->struct_mutex);
return ret;
@@ -4121,7 +4121,7 @@ void __i915_vma_set_map_and_fenceable(struct i915_vma *vma)
args->retained = obj->madv != __I915_MADV_PURGED;
out:
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
unlock:
mutex_unlock(&dev->struct_mutex);
return ret;
@@ -4952,6 +4952,6 @@ struct drm_i915_gem_object *
return obj;
fail:
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
return ERR_PTR(ret);
}
diff --git a/drivers/gpu/drm/i915/i915_gem_batch_pool.c b/drivers/gpu/drm/i915/i915_gem_batch_pool.c
index 3752d5d..ed1f7ee 100644
--- a/drivers/gpu/drm/i915/i915_gem_batch_pool.c
+++ b/drivers/gpu/drm/i915/i915_gem_batch_pool.c
@@ -75,7 +75,7 @@ void i915_gem_batch_pool_fini(struct i915_gem_batch_pool *pool)
batch_pool_link);
list_del(&obj->batch_pool_link);
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
}
}
}
@@ -121,7 +121,7 @@ struct drm_i915_gem_object *
/* While we're looping, do some clean up */
if (tmp->madv == __I915_MADV_PURGED) {
list_del(&tmp->batch_pool_link);
- drm_gem_object_unreference(&tmp->base);
+ i915_gem_object_unreference(tmp);
continue;
}
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index 3b63616..e767889 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -176,7 +176,7 @@ void i915_gem_context_free(struct kref *ctx_ref)
if (ce->ringbuf)
intel_ringbuffer_free(ce->ringbuf);
- drm_gem_object_unreference(&ce->state->base);
+ i915_gem_object_unreference(ce->state);
}
list_del(&ctx->link);
@@ -216,7 +216,7 @@ struct drm_i915_gem_object *
ret = i915_gem_object_set_cache_level(obj, I915_CACHE_L3_LLC);
/* Failure shouldn't ever happen this early */
if (WARN_ON(ret)) {
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
return ERR_PTR(ret);
}
}
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index 7f83280..44ce069 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -176,7 +176,7 @@ struct eb_vmas {
struct drm_i915_gem_object,
obj_exec_link);
list_del_init(&obj->obj_exec_link);
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
}
/*
* Objects already transfered to the vmas list will be unreferenced by
@@ -264,7 +264,7 @@ static void eb_destroy(struct eb_vmas *eb)
exec_list);
list_del_init(&vma->exec_list);
i915_gem_execbuffer_unreserve_vma(vma);
- drm_gem_object_unreference(&vma->obj->base);
+ i915_gem_object_unreference(vma->obj);
}
kfree(eb);
}
@@ -873,7 +873,7 @@ static bool only_mappable_for_reloc(unsigned int flags)
vma = list_first_entry(&eb->vmas, struct i915_vma, exec_list);
list_del_init(&vma->exec_list);
i915_gem_execbuffer_unreserve_vma(vma);
- drm_gem_object_unreference(&vma->obj->base);
+ i915_gem_object_unreference(vma->obj);
}
mutex_unlock(&dev->struct_mutex);
diff --git a/drivers/gpu/drm/i915/i915_gem_render_state.c b/drivers/gpu/drm/i915/i915_gem_render_state.c
index f75bbd6..09703ed 100644
--- a/drivers/gpu/drm/i915/i915_gem_render_state.c
+++ b/drivers/gpu/drm/i915/i915_gem_render_state.c
@@ -70,7 +70,7 @@ static int render_state_init(struct render_state *so,
return 0;
free_gem:
- drm_gem_object_unreference(&so->obj->base);
+ i915_gem_object_unreference(so->obj);
return ret;
}
@@ -195,7 +195,7 @@ static int render_state_setup(struct render_state *so)
void i915_gem_render_state_fini(struct render_state *so)
{
i915_gem_object_ggtt_unpin(so->obj);
- drm_gem_object_unreference(&so->obj->base);
+ i915_gem_object_unreference(so->obj);
}
int i915_gem_render_state_prepare(struct intel_engine_cs *engine,
diff --git a/drivers/gpu/drm/i915/i915_gem_shrinker.c b/drivers/gpu/drm/i915/i915_gem_shrinker.c
index 0668d4c..53cf2e0 100644
--- a/drivers/gpu/drm/i915/i915_gem_shrinker.c
+++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c
@@ -201,7 +201,7 @@ static bool can_release_pages(struct drm_i915_gem_object *obj)
if (i915_gem_object_put_pages(obj) == 0)
count += obj->base.size >> PAGE_SHIFT;
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
}
list_splice(&still_in_list, phase->list);
}
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
index ca96bcf..0b6911f 100644
--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
@@ -716,6 +716,6 @@ struct drm_i915_gem_object *
return obj;
err:
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
return NULL;
}
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c
index 7c3b700..68109e4 100644
--- a/drivers/gpu/drm/i915/i915_gem_tiling.c
+++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
@@ -268,7 +268,7 @@
}
err:
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
mutex_unlock(&dev->struct_mutex);
intel_runtime_pm_put(dev_priv);
@@ -328,7 +328,7 @@
if (args->swizzle_mode == I915_BIT_6_SWIZZLE_9_10_17)
args->swizzle_mode = I915_BIT_6_SWIZZLE_9_10;
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
mutex_unlock(&dev->struct_mutex);
return 0;
diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c
index 3532aa6..f08be8b 100644
--- a/drivers/gpu/drm/i915/i915_gem_userptr.c
+++ b/drivers/gpu/drm/i915/i915_gem_userptr.c
@@ -119,7 +119,7 @@ static void cancel_userptr(struct work_struct *work)
dev_priv->mm.interruptible = was_interruptible;
}
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
mutex_unlock(&dev->struct_mutex);
}
@@ -577,7 +577,7 @@ struct get_pages_work {
}
obj->userptr.workers--;
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
mutex_unlock(&dev->struct_mutex);
release_pages(pvec, pinned, 0);
diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c
index 1cc5de1..2f161b7 100644
--- a/drivers/gpu/drm/i915/i915_guc_submission.c
+++ b/drivers/gpu/drm/i915/i915_guc_submission.c
@@ -633,13 +633,13 @@ int i915_guc_submit(struct drm_i915_gem_request *rq)
return NULL;
if (i915_gem_object_get_pages(obj)) {
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
return NULL;
}
if (i915_gem_obj_ggtt_pin(obj, PAGE_SIZE,
PIN_OFFSET_BIAS | GUC_WOPCM_TOP)) {
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
return NULL;
}
@@ -661,7 +661,7 @@ static void gem_release_guc_obj(struct drm_i915_gem_object *obj)
if (i915_gem_obj_is_pinned(obj))
i915_gem_object_ggtt_unpin(obj);
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
}
static void
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 37b2b62..6baa2c3 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2488,7 +2488,7 @@ static int skl_format_to_fourcc(int format, bool rgb_order, bool alpha)
return true;
out_unref_obj:
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
mutex_unlock(&dev->struct_mutex);
return false;
}
@@ -10953,7 +10953,7 @@ static void intel_unpin_work_fn(struct work_struct *__work)
mutex_lock(&dev->struct_mutex);
intel_unpin_fb_obj(work->old_fb, primary->state->rotation);
- drm_gem_object_unreference(&work->pending_flip_obj->base);
+ i915_gem_object_unreference(work->pending_flip_obj);
if (work->flip_queued_req)
i915_gem_request_assign(&work->flip_queued_req, NULL);
@@ -14853,7 +14853,7 @@ static void intel_user_framebuffer_destroy(struct drm_framebuffer *fb)
drm_framebuffer_cleanup(fb);
mutex_lock(&dev->struct_mutex);
WARN_ON(!intel_fb->obj->framebuffer_references--);
- drm_gem_object_unreference(&intel_fb->obj->base);
+ i915_gem_object_unreference(intel_fb->obj);
mutex_unlock(&dev->struct_mutex);
kfree(intel_fb);
}
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index 23129dc..4add2ad 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -159,7 +159,7 @@ static int intelfb_alloc(struct drm_fb_helper *helper,
fb = __intel_framebuffer_create(dev, &mode_cmd, obj);
if (IS_ERR(fb)) {
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
ret = PTR_ERR(fb);
goto out;
}
diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
index 605c696..01c075a 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -662,7 +662,7 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)
mutex_lock(&dev->struct_mutex);
obj = guc_fw->guc_fw_obj;
if (obj)
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
guc_fw->guc_fw_obj = NULL;
mutex_unlock(&dev->struct_mutex);
@@ -743,7 +743,7 @@ void intel_guc_fini(struct drm_device *dev)
i915_guc_submission_fini(dev_priv);
if (guc_fw->guc_fw_obj)
- drm_gem_object_unreference(&guc_fw->guc_fw_obj->base);
+ i915_gem_object_unreference(guc_fw->guc_fw_obj);
guc_fw->guc_fw_obj = NULL;
mutex_unlock(&dev->struct_mutex);
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 860dba2..e1a65e7 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -1367,7 +1367,7 @@ static int lrc_setup_wa_ctx_obj(struct intel_engine_cs *engine, u32 size)
if (ret) {
DRM_DEBUG_DRIVER("pin LRC WA ctx backing obj failed: %d\n",
ret);
- drm_gem_object_unreference(&engine->wa_ctx.obj->base);
+ i915_gem_object_unreference(engine->wa_ctx.obj);
return ret;
}
@@ -1378,7 +1378,7 @@ static void lrc_destroy_wa_ctx_obj(struct intel_engine_cs *engine)
{
if (engine->wa_ctx.obj) {
i915_gem_object_ggtt_unpin(engine->wa_ctx.obj);
- drm_gem_object_unreference(&engine->wa_ctx.obj->base);
+ i915_gem_object_unreference(engine->wa_ctx.obj);
engine->wa_ctx.obj = NULL;
}
}
@@ -2382,7 +2382,7 @@ static int execlists_context_deferred_alloc(struct i915_gem_context *ctx,
error_ringbuf:
intel_ringbuffer_free(ringbuf);
error_deref_obj:
- drm_gem_object_unreference(&ctx_obj->base);
+ i915_gem_object_unreference(ctx_obj);
ce->ringbuf = NULL;
ce->state = NULL;
return ret;
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index 6146b79..6aeaa73 100644
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -308,7 +308,7 @@ static void intel_overlay_release_old_vid_tail(struct intel_overlay *overlay)
struct drm_i915_gem_object *obj = overlay->old_vid_bo;
i915_gem_object_ggtt_unpin(obj);
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
overlay->old_vid_bo = NULL;
}
@@ -322,7 +322,7 @@ static void intel_overlay_off_tail(struct intel_overlay *overlay)
return;
i915_gem_object_ggtt_unpin(obj);
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
overlay->vid_bo = NULL;
overlay->crtc->overlay = NULL;
@@ -1444,7 +1444,7 @@ void intel_setup_overlay(struct drm_i915_private *dev_priv)
if (!OVERLAY_NEEDS_PHYSICAL(dev_priv))
i915_gem_object_ggtt_unpin(reg_bo);
out_free_bo:
- drm_gem_object_unreference(®_bo->base);
+ i915_gem_object_unreference(reg_bo);
out_free:
mutex_unlock(&dev_priv->drm.struct_mutex);
kfree(overlay);
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index af0bd71..2372313 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -641,7 +641,7 @@ void intel_fini_pipe_control(struct intel_engine_cs *engine)
return;
i915_gem_object_ggtt_unpin(engine->scratch.obj);
- drm_gem_object_unreference(&engine->scratch.obj->base);
+ i915_gem_object_unreference(engine->scratch.obj);
engine->scratch.obj = NULL;
}
@@ -672,7 +672,7 @@ int intel_init_pipe_control(struct intel_engine_cs *engine, int size)
return 0;
err_unref:
- drm_gem_object_unreference(&engine->scratch.obj->base);
+ i915_gem_object_unreference(engine->scratch.obj);
err:
return ret;
}
@@ -1312,7 +1312,7 @@ static void render_ring_cleanup(struct intel_engine_cs *engine)
if (dev_priv->semaphore_obj) {
i915_gem_object_ggtt_unpin(dev_priv->semaphore_obj);
- drm_gem_object_unreference(&dev_priv->semaphore_obj->base);
+ i915_gem_object_unreference(dev_priv->semaphore_obj);
dev_priv->semaphore_obj = NULL;
}
@@ -1898,7 +1898,7 @@ static void cleanup_status_page(struct intel_engine_cs *engine)
kunmap(sg_page(obj->pages->sgl));
i915_gem_object_ggtt_unpin(obj);
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
engine->status_page.obj = NULL;
}
@@ -1936,7 +1936,7 @@ static int init_status_page(struct intel_engine_cs *engine)
ret = i915_gem_obj_ggtt_pin(obj, 4096, flags);
if (ret) {
err_unref:
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
return ret;
}
@@ -2039,7 +2039,7 @@ int intel_pin_and_map_ringbuffer_obj(struct drm_i915_private *dev_priv,
static void intel_destroy_ringbuffer_obj(struct intel_ringbuffer *ringbuf)
{
- drm_gem_object_unreference(&ringbuf->obj->base);
+ i915_gem_object_unreference(ringbuf->obj);
ringbuf->obj = NULL;
}
@@ -2691,7 +2691,7 @@ static void intel_ring_init_semaphores(struct drm_i915_private *dev_priv,
i915_gem_object_set_cache_level(obj, I915_CACHE_LLC);
ret = i915_gem_obj_ggtt_pin(obj, 0, PIN_NONBLOCK);
if (ret != 0) {
- drm_gem_object_unreference(&obj->base);
+ i915_gem_object_unreference(obj);
DRM_ERROR("Failed to pin semaphore bo. Disabling semaphores\n");
i915.semaphores = 0;
} else {
--
1.9.1
More information about the Intel-gfx-trybot
mailing list