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

Commit 117897f4 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: More renaming of rings to engines 



This time using only sed and a few by hand.

v2: Rename also intel_ring_id and intel_ring_initialized.
v3: Fixed typo in intel_ring_initialized.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1458126040-33105-1-git-send-email-tvrtko.ursulin@linux.intel.com
parent 666796da

drivers/gpu/drm/i915/i915_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -2483,7 +2483,7 @@ static int i915_guc_info(struct seq_file *m, void *data) 
	struct intel_guc guc;

	struct i915_guc_client client = {};

	struct intel_engine_cs *engine;

	enum intel_ring_id i;

	enum intel_engine_id i;

	u64 total = 0;



	if (!HAS_GUC_SCHED(dev_priv->dev))

drivers/gpu/drm/i915/i915_dma.c

+6 −6
Original line number Diff line number Diff line
@@ -87,16 +87,16 @@ static int i915_getparam(struct drm_device *dev, void *data, 
		value = 1;

		break;

	case I915_PARAM_HAS_BSD:

		value = intel_ring_initialized(&dev_priv->engine[VCS]);

		value = intel_engine_initialized(&dev_priv->engine[VCS]);

		break;

	case I915_PARAM_HAS_BLT:

		value = intel_ring_initialized(&dev_priv->engine[BCS]);

		value = intel_engine_initialized(&dev_priv->engine[BCS]);

		break;

	case I915_PARAM_HAS_VEBOX:

		value = intel_ring_initialized(&dev_priv->engine[VECS]);

		value = intel_engine_initialized(&dev_priv->engine[VECS]);

		break;

	case I915_PARAM_HAS_BSD2:

		value = intel_ring_initialized(&dev_priv->engine[VCS2]);

		value = intel_engine_initialized(&dev_priv->engine[VCS2]);

		break;

	case I915_PARAM_HAS_RELAXED_FENCING:

		value = 1;
@@ -444,7 +444,7 @@ static int i915_load_modeset_init(struct drm_device *dev) 


cleanup_gem:

	mutex_lock(&dev->struct_mutex);

	i915_gem_cleanup_ringbuffer(dev);

	i915_gem_cleanup_engines(dev);

	i915_gem_context_fini(dev);

	mutex_unlock(&dev->struct_mutex);

cleanup_irq:
@@ -1261,7 +1261,7 @@ int i915_driver_unload(struct drm_device *dev) 


	intel_guc_ucode_fini(dev);

	mutex_lock(&dev->struct_mutex);

	i915_gem_cleanup_ringbuffer(dev);

	i915_gem_cleanup_engines(dev);

	i915_gem_context_fini(dev);

	mutex_unlock(&dev->struct_mutex);

	intel_fbc_cleanup_cfb(dev_priv);

drivers/gpu/drm/i915/i915_drv.h

+7 −7
Original line number Diff line number Diff line
@@ -1931,9 +1931,9 @@ struct drm_i915_private { 
		int (*execbuf_submit)(struct i915_execbuffer_params *params,

				      struct drm_i915_gem_execbuffer2 *args,

				      struct list_head *vmas);

		int (*init_rings)(struct drm_device *dev);

		void (*cleanup_ring)(struct intel_engine_cs *ring);

		void (*stop_ring)(struct intel_engine_cs *ring);

		int (*init_engines)(struct drm_device *dev);

		void (*cleanup_engine)(struct intel_engine_cs *engine);

		void (*stop_engine)(struct intel_engine_cs *engine);

	} gt;



	struct intel_context *kernel_context;
@@ -1969,7 +1969,7 @@ static inline struct drm_i915_private *guc_to_i915(struct intel_guc *guc) 
/* Iterate over initialised rings */

#define for_each_engine(ring__, dev_priv__, i__) \

	for ((i__) = 0; (i__) < I915_NUM_ENGINES; (i__)++) \

		for_each_if ((((ring__) = &(dev_priv__)->engine[(i__)]), intel_ring_initialized((ring__))))

		for_each_if ((((ring__) = &(dev_priv__)->engine[(i__)]), intel_engine_initialized((ring__))))



enum hdmi_force_audio {

	HDMI_AUDIO_OFF_DVI = -2,	/* no aux data for HDMI-DVI converter */
@@ -2039,7 +2039,7 @@ struct drm_i915_gem_object { 
	struct drm_mm_node *stolen;

	struct list_head global_list;



	struct list_head ring_list[I915_NUM_ENGINES];

	struct list_head engine_list[I915_NUM_ENGINES];

	/** Used in execbuf to temporarily hold a ref */

	struct list_head obj_exec_link;
@@ -3002,11 +3002,11 @@ static inline bool i915_stop_ring_allow_warn(struct drm_i915_private *dev_priv) 
void i915_gem_reset(struct drm_device *dev);

bool i915_gem_clflush_object(struct drm_i915_gem_object *obj, bool force);

int __must_check i915_gem_init(struct drm_device *dev);

int i915_gem_init_rings(struct drm_device *dev);

int i915_gem_init_engines(struct drm_device *dev);

int __must_check i915_gem_init_hw(struct drm_device *dev);

int i915_gem_l3_remap(struct drm_i915_gem_request *req, int slice);

void i915_gem_init_swizzling(struct drm_device *dev);

void i915_gem_cleanup_ringbuffer(struct drm_device *dev);

void i915_gem_cleanup_engines(struct drm_device *dev);

int __must_check i915_gpu_idle(struct drm_device *dev);

int __must_check i915_gem_suspend(struct drm_device *dev);

void __i915_add_request(struct drm_i915_gem_request *req,

drivers/gpu/drm/i915/i915_gem.c

+25 −25
Original line number Diff line number Diff line
@@ -2413,7 +2413,7 @@ void i915_vma_move_to_active(struct i915_vma *vma, 
		drm_gem_object_reference(&obj->base);

	obj->active |= intel_engine_flag(engine);



	list_move_tail(&obj->ring_list[engine->id], &engine->active_list);

	list_move_tail(&obj->engine_list[engine->id], &engine->active_list);

	i915_gem_request_assign(&obj->last_read_req[engine->id], req);



	list_move_tail(&vma->vm_link, &vma->vm->active_list);
@@ -2437,7 +2437,7 @@ i915_gem_object_retire__read(struct drm_i915_gem_object *obj, int ring) 
	RQ_BUG_ON(obj->last_read_req[ring] == NULL);

	RQ_BUG_ON(!(obj->active & (1 << ring)));



	list_del_init(&obj->ring_list[ring]);

	list_del_init(&obj->engine_list[ring]);

	i915_gem_request_assign(&obj->last_read_req[ring], NULL);



	if (obj->last_write_req && obj->last_write_req->engine->id == ring)
@@ -2830,7 +2830,7 @@ static void i915_gem_reset_engine_cleanup(struct drm_i915_private *dev_priv, 


		obj = list_first_entry(&engine->active_list,

				       struct drm_i915_gem_object,

				       ring_list[engine->id]);

				       engine_list[engine->id]);



		i915_gem_object_retire__read(obj, engine->id);

	}
@@ -2941,7 +2941,7 @@ i915_gem_retire_requests_ring(struct intel_engine_cs *engine) 


		obj = list_first_entry(&engine->active_list,

				       struct drm_i915_gem_object,

				       ring_list[engine->id]);

				       engine_list[engine->id]);



		if (!list_empty(&obj->last_read_req[engine->id]->list))

			break;
@@ -4448,7 +4448,7 @@ void i915_gem_object_init(struct drm_i915_gem_object *obj, 


	INIT_LIST_HEAD(&obj->global_list);

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

		INIT_LIST_HEAD(&obj->ring_list[i]);

		INIT_LIST_HEAD(&obj->engine_list[i]);

	INIT_LIST_HEAD(&obj->obj_exec_link);

	INIT_LIST_HEAD(&obj->vma_list);

	INIT_LIST_HEAD(&obj->batch_pool_link);
@@ -4653,14 +4653,14 @@ void i915_gem_vma_destroy(struct i915_vma *vma) 
}



static void

i915_gem_stop_ringbuffers(struct drm_device *dev)

i915_gem_stop_engines(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_engine_cs *engine;

	int i;



	for_each_engine(engine, dev_priv, i)

		dev_priv->gt.stop_ring(engine);

		dev_priv->gt.stop_engine(engine);

}



int
@@ -4676,7 +4676,7 @@ i915_gem_suspend(struct drm_device *dev) 


	i915_gem_retire_requests(dev);



	i915_gem_stop_ringbuffers(dev);

	i915_gem_stop_engines(dev);

	mutex_unlock(&dev->struct_mutex);



	cancel_delayed_work_sync(&dev_priv->gpu_error.hangcheck_work);
@@ -4778,7 +4778,7 @@ static void init_unused_rings(struct drm_device *dev) 
	}

}



int i915_gem_init_rings(struct drm_device *dev)

int i915_gem_init_engines(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	int ret;
@@ -4814,13 +4814,13 @@ int i915_gem_init_rings(struct drm_device *dev) 
	return 0;



cleanup_vebox_ring:

	intel_cleanup_ring_buffer(&dev_priv->engine[VECS]);

	intel_cleanup_engine(&dev_priv->engine[VECS]);

cleanup_blt_ring:

	intel_cleanup_ring_buffer(&dev_priv->engine[BCS]);

	intel_cleanup_engine(&dev_priv->engine[BCS]);

cleanup_bsd_ring:

	intel_cleanup_ring_buffer(&dev_priv->engine[VCS]);

	intel_cleanup_engine(&dev_priv->engine[VCS]);

cleanup_render_ring:

	intel_cleanup_ring_buffer(&dev_priv->engine[RCS]);

	intel_cleanup_engine(&dev_priv->engine[RCS]);



	return ret;

}
@@ -4907,7 +4907,7 @@ i915_gem_init_hw(struct drm_device *dev) 
		req = i915_gem_request_alloc(engine, NULL);

		if (IS_ERR(req)) {

			ret = PTR_ERR(req);

			i915_gem_cleanup_ringbuffer(dev);

			i915_gem_cleanup_engines(dev);

			goto out;

		}
@@ -4920,7 +4920,7 @@ i915_gem_init_hw(struct drm_device *dev) 
		if (ret && ret != -EIO) {

			DRM_ERROR("PPGTT enable ring #%d failed %d\n", i, ret);

			i915_gem_request_cancel(req);

			i915_gem_cleanup_ringbuffer(dev);

			i915_gem_cleanup_engines(dev);

			goto out;

		}
@@ -4928,7 +4928,7 @@ i915_gem_init_hw(struct drm_device *dev) 
		if (ret && ret != -EIO) {

			DRM_ERROR("Context enable ring #%d failed %d\n", i, ret);

			i915_gem_request_cancel(req);

			i915_gem_cleanup_ringbuffer(dev);

			i915_gem_cleanup_engines(dev);

			goto out;

		}
@@ -4952,14 +4952,14 @@ int i915_gem_init(struct drm_device *dev) 


	if (!i915.enable_execlists) {

		dev_priv->gt.execbuf_submit = i915_gem_ringbuffer_submission;

		dev_priv->gt.init_rings = i915_gem_init_rings;

		dev_priv->gt.cleanup_ring = intel_cleanup_ring_buffer;

		dev_priv->gt.stop_ring = intel_stop_ring_buffer;

		dev_priv->gt.init_engines = i915_gem_init_engines;

		dev_priv->gt.cleanup_engine = intel_cleanup_engine;

		dev_priv->gt.stop_engine = intel_stop_engine;

	} else {

		dev_priv->gt.execbuf_submit = intel_execlists_submission;

		dev_priv->gt.init_rings = intel_logical_rings_init;

		dev_priv->gt.cleanup_ring = intel_logical_ring_cleanup;

		dev_priv->gt.stop_ring = intel_logical_ring_stop;

		dev_priv->gt.init_engines = intel_logical_rings_init;

		dev_priv->gt.cleanup_engine = intel_logical_ring_cleanup;

		dev_priv->gt.stop_engine = intel_logical_ring_stop;

	}



	/* This is just a security blanket to placate dragons.
@@ -4980,7 +4980,7 @@ int i915_gem_init(struct drm_device *dev) 
	if (ret)

		goto out_unlock;



	ret = dev_priv->gt.init_rings(dev);

	ret = dev_priv->gt.init_engines(dev);

	if (ret)

		goto out_unlock;
@@ -5003,14 +5003,14 @@ int i915_gem_init(struct drm_device *dev) 
}



void

i915_gem_cleanup_ringbuffer(struct drm_device *dev)

i915_gem_cleanup_engines(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_engine_cs *engine;

	int i;



	for_each_engine(engine, dev_priv, i)

		dev_priv->gt.cleanup_ring(engine);

		dev_priv->gt.cleanup_engine(engine);



    if (i915.enable_execlists)

            /*

drivers/gpu/drm/i915/i915_gem_debug.c

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ i915_verify_lists(struct drm_device *dev) 


	for_each_engine(engine, dev_priv, i) {

		list_for_each_entry(obj, &engine->active_list,

				    ring_list[engine->id]) {

				    engine_list[engine->id]) {

			if (obj->base.dev != dev ||

			    !atomic_read(&obj->base.refcount.refcount)) {

				DRM_ERROR("%s: freed active obj %p\n",