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

Commit f8c417cd authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Rename drm_gem_object_unreference in preparation for lockless free 



Ultimately wraps kref_put(), so adopt its nomenclature for consistency
with other subsystems.

s/drm_gem_object_unreference/i915_gem_object_put/

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1469005202-9659-6-git-send-email-chris@chris-wilson.co.uk


Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1469017917-15134-5-git-send-email-chris@chris-wilson.co.uk
parent 25dc556a

drivers/gpu/drm/i915/i915_drv.h

+10 −0
Original line number Diff line number Diff line
@@ -2317,6 +2317,16 @@ i915_gem_object_get(struct drm_i915_gem_object *obj) 
__deprecated

extern void drm_gem_object_reference(struct drm_gem_object *);



__attribute__((nonnull))

static inline void

i915_gem_object_put(struct drm_i915_gem_object *obj)

{

	drm_gem_object_unreference(&obj->base);

}



__deprecated

extern void drm_gem_object_unreference(struct drm_gem_object *);



static inline bool

i915_gem_object_has_struct_page(const struct drm_i915_gem_object *obj)

{

drivers/gpu/drm/i915/i915_gem.c

+13 −13
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ drop_pages(struct drm_i915_gem_object *obj) 
			break;



	ret = i915_gem_object_put_pages(obj);

	drm_gem_object_unreference(&obj->base);

	i915_gem_object_put(obj);



	return ret;

}
@@ -887,7 +887,7 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data, 
					args->offset, args->data_ptr);



out:

	drm_gem_object_unreference(&obj->base);

	i915_gem_object_put(obj);

unlock:

	mutex_unlock(&dev->struct_mutex);

	return ret;
@@ -1320,7 +1320,7 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data, 
	}



out:

	drm_gem_object_unreference(&obj->base);

	i915_gem_object_put(obj);

unlock:

	mutex_unlock(&dev->struct_mutex);

put_rpm:
@@ -1522,7 +1522,7 @@ i915_gem_set_domain_ioctl(struct drm_device *dev, void *data, 
		intel_fb_obj_invalidate(obj, write_origin(obj, write_domain));



unref:

	drm_gem_object_unreference(&obj->base);

	i915_gem_object_put(obj);

unlock:

	mutex_unlock(&dev->struct_mutex);

	return ret;
@@ -1556,7 +1556,7 @@ i915_gem_sw_finish_ioctl(struct drm_device *dev, void *data, 
	if (obj->pin_display)

		i915_gem_object_flush_cpu_write_domain(obj);



	drm_gem_object_unreference(&obj->base);

	i915_gem_object_put(obj);

unlock:

	mutex_unlock(&dev->struct_mutex);

	return ret;
@@ -1987,7 +1987,7 @@ i915_gem_mmap_gtt(struct drm_file *file, 
	*offset = drm_vma_node_offset_addr(&obj->base.vma_node);



out:

	drm_gem_object_unreference(&obj->base);

	i915_gem_object_put(obj);

unlock:

	mutex_unlock(&dev->struct_mutex);

	return ret;
@@ -2411,7 +2411,7 @@ i915_gem_object_retire__read(struct drm_i915_gem_object *obj, int ring) 
	}



	i915_gem_request_assign(&obj->last_fenced_req, NULL);

	drm_gem_object_unreference(&obj->base);

	i915_gem_object_put(obj);

}



static bool i915_context_is_banned(const struct i915_gem_context *ctx)
@@ -2814,7 +2814,7 @@ i915_gem_wait_ioctl(struct drm_device *dev, void *data, struct drm_file *file) 
		goto out;

	}



	drm_gem_object_unreference(&obj->base);

	i915_gem_object_put(obj);



	for (i = 0; i < I915_NUM_ENGINES; i++) {

		if (obj->last_read_req[i] == NULL)
@@ -2835,7 +2835,7 @@ i915_gem_wait_ioctl(struct drm_device *dev, void *data, struct drm_file *file) 
	return ret;



out:

	drm_gem_object_unreference(&obj->base);

	i915_gem_object_put(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_put(obj);

unlock:

	mutex_unlock(&dev->struct_mutex);

rpm_put:
@@ -4057,7 +4057,7 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data, 
	}



unref:

	drm_gem_object_unreference(&obj->base);

	i915_gem_object_put(obj);

unlock:

	mutex_unlock(&dev->struct_mutex);

	return ret;
@@ -4121,7 +4121,7 @@ i915_gem_madvise_ioctl(struct drm_device *dev, void *data, 
	args->retained = obj->madv != __I915_MADV_PURGED;



out:

	drm_gem_object_unreference(&obj->base);

	i915_gem_object_put(obj);

unlock:

	mutex_unlock(&dev->struct_mutex);

	return ret;
@@ -4952,6 +4952,6 @@ i915_gem_object_create_from_data(struct drm_device *dev, 
	return obj;



fail:

	drm_gem_object_unreference(&obj->base);

	i915_gem_object_put(obj);

	return ERR_PTR(ret);

}

drivers/gpu/drm/i915/i915_gem_batch_pool.c

+2 −2
Original line number Diff line number Diff line
@@ -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_put(obj);

		}

	}

}
@@ -121,7 +121,7 @@ i915_gem_batch_pool_get(struct i915_gem_batch_pool *pool, 
		/* 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_put(tmp);

			continue;

		}

drivers/gpu/drm/i915/i915_gem_context.c

+2 −2
Original line number Diff line number Diff line
@@ -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_put(ce->state);

	}



	list_del(&ctx->link);
@@ -216,7 +216,7 @@ i915_gem_alloc_context_obj(struct drm_device *dev, size_t size) 
		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_put(obj);

			return ERR_PTR(ret);

		}

	}

drivers/gpu/drm/i915/i915_gem_evict.c

+4 −3
Original line number Diff line number Diff line
@@ -191,17 +191,18 @@ i915_gem_evict_something(struct drm_device *dev, struct i915_address_space *vm, 


	/* Unbinding will emit any required flushes */

	while (!list_empty(&eviction_list)) {

		struct drm_gem_object *obj;

		struct drm_i915_gem_object *obj;



		vma = list_first_entry(&eviction_list,

				       struct i915_vma,

				       exec_list);



		obj =  &vma->obj->base;

		obj =  vma->obj;

		list_del_init(&vma->exec_list);

		if (ret == 0)

			ret = i915_vma_unbind(vma);



		drm_gem_object_unreference(obj);

		i915_gem_object_put(obj);

	}



	return ret;