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

drm/i915: Remove i915.enable_execlists module parameter 



Execlists and legacy ringbuffer submission are no longer feature
comparable (execlists now offer greater functionality that should
overcome their performance hit) and obsoletes the unsafe module
parameter, i.e. comparing the two modes of execution is no longer
useful, so remove the debug tool.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> #i915_perf.c
Link: https://patchwork.freedesktop.org/patch/msgid/20171120205504.21892-1-chris@chris-wilson.co.uk
parent ba74cb10

drivers/gpu/drm/i915/gvt/render.c

+1 −2
Original line number Diff line number Diff line
@@ -294,8 +294,7 @@ static void switch_mmio_to_vgpu(struct intel_vgpu *vgpu, int ring_id) 
		 * write.

		 */

		if (mmio->in_context &&

				((ctx_ctrl & inhibit_mask) != inhibit_mask) &&

				i915_modparams.enable_execlists)

		    (ctx_ctrl & inhibit_mask) != inhibit_mask)

			continue;



		if (mmio->mask)

drivers/gpu/drm/i915/i915_debugfs.c

+0 −70
Original line number Diff line number Diff line
@@ -1989,75 +1989,6 @@ static int i915_context_status(struct seq_file *m, void *unused) 
	return 0;

}



static void i915_dump_lrc_obj(struct seq_file *m,

			      struct i915_gem_context *ctx,

			      struct intel_engine_cs *engine)

{

	struct i915_vma *vma = ctx->engine[engine->id].state;

	struct page *page;

	int j;



	seq_printf(m, "CONTEXT: %s %u\n", engine->name, ctx->hw_id);



	if (!vma) {

		seq_puts(m, "\tFake context\n");

		return;

	}



	if (vma->flags & I915_VMA_GLOBAL_BIND)

		seq_printf(m, "\tBound in GGTT at 0x%08x\n",

			   i915_ggtt_offset(vma));



	if (i915_gem_object_pin_pages(vma->obj)) {

		seq_puts(m, "\tFailed to get pages for context object\n\n");

		return;

	}



	page = i915_gem_object_get_page(vma->obj, LRC_STATE_PN);

	if (page) {

		u32 *reg_state = kmap_atomic(page);



		for (j = 0; j < 0x600 / sizeof(u32) / 4; j += 4) {

			seq_printf(m,

				   "\t[0x%04x] 0x%08x 0x%08x 0x%08x 0x%08x\n",

				   j * 4,

				   reg_state[j], reg_state[j + 1],

				   reg_state[j + 2], reg_state[j + 3]);

		}

		kunmap_atomic(reg_state);

	}



	i915_gem_object_unpin_pages(vma->obj);

	seq_putc(m, '\n');

}



static int i915_dump_lrc(struct seq_file *m, void *unused)

{

	struct drm_i915_private *dev_priv = node_to_i915(m->private);

	struct drm_device *dev = &dev_priv->drm;

	struct intel_engine_cs *engine;

	struct i915_gem_context *ctx;

	enum intel_engine_id id;

	int ret;



	if (!i915_modparams.enable_execlists) {

		seq_printf(m, "Logical Ring Contexts are disabled\n");

		return 0;

	}



	ret = mutex_lock_interruptible(&dev->struct_mutex);

	if (ret)

		return ret;



	list_for_each_entry(ctx, &dev_priv->contexts.list, link)

		for_each_engine(engine, dev_priv, id)

			i915_dump_lrc_obj(m, ctx, engine);



	mutex_unlock(&dev->struct_mutex);



	return 0;

}



static const char *swizzle_string(unsigned swizzle)

{

	switch (swizzle) {
@@ -4833,7 +4764,6 @@ static const struct drm_info_list i915_debugfs_list[] = { 
	{"i915_vbt", i915_vbt, 0},

	{"i915_gem_framebuffer", i915_gem_framebuffer_info, 0},

	{"i915_context_status", i915_context_status, 0},

	{"i915_dump_lrc", i915_dump_lrc, 0},

	{"i915_forcewake_domains", i915_forcewake_domains, 0},

	{"i915_swizzle_info", i915_swizzle_info, 0},

	{"i915_ppgtt_info", i915_ppgtt_info, 0},

drivers/gpu/drm/i915/i915_drv.c

+1 −7
Original line number Diff line number Diff line
@@ -371,9 +371,7 @@ static int i915_getparam(struct drm_device *dev, void *data, 
		if (dev_priv->engine[RCS] && dev_priv->engine[RCS]->schedule) {

			value |= I915_SCHEDULER_CAP_ENABLED;

			value |= I915_SCHEDULER_CAP_PRIORITY;



			if (HAS_LOGICAL_RING_PREEMPTION(dev_priv) &&

			    i915_modparams.enable_execlists)

			if (HAS_LOGICAL_RING_PREEMPTION(dev_priv))

				value |= I915_SCHEDULER_CAP_PREEMPTION;

		}

		break;
@@ -1054,10 +1052,6 @@ static void i915_driver_cleanup_mmio(struct drm_i915_private *dev_priv) 


static void intel_sanitize_options(struct drm_i915_private *dev_priv)

{

	i915_modparams.enable_execlists =

		intel_sanitize_enable_execlists(dev_priv,

						i915_modparams.enable_execlists);



	/*

	 * i915.enable_ppgtt is read-only, so do an early pass to validate the

	 * user's requested state against the hardware/driver capabilities.  We

drivers/gpu/drm/i915/i915_drv.h

+3 −0
Original line number Diff line number Diff line
@@ -3153,6 +3153,9 @@ intel_info(const struct drm_i915_private *dev_priv) 
		((dev_priv)->info.has_logical_ring_contexts)

#define HAS_LOGICAL_RING_PREEMPTION(dev_priv) \

		((dev_priv)->info.has_logical_ring_preemption)



#define HAS_EXECLISTS(dev_priv) HAS_LOGICAL_RING_CONTEXTS(dev_priv)



#define USES_PPGTT(dev_priv)		(i915_modparams.enable_ppgtt)

#define USES_FULL_PPGTT(dev_priv)	(i915_modparams.enable_ppgtt >= 2)

#define USES_FULL_48BIT_PPGTT(dev_priv)	(i915_modparams.enable_ppgtt == 3)

drivers/gpu/drm/i915/i915_gem.c

+5 −5
Original line number Diff line number Diff line
@@ -5003,7 +5003,7 @@ bool intel_sanitize_semaphores(struct drm_i915_private *dev_priv, int value) 
		return false;



	/* TODO: make semaphores and Execlists play nicely together */

	if (i915_modparams.enable_execlists)

	if (HAS_EXECLISTS(dev_priv))

		return false;



	if (value >= 0)
@@ -5147,12 +5147,12 @@ int i915_gem_init(struct drm_i915_private *dev_priv) 


	dev_priv->mm.unordered_timeline = dma_fence_context_alloc(1);



	if (!i915_modparams.enable_execlists) {

		dev_priv->gt.resume = intel_legacy_submission_resume;

		dev_priv->gt.cleanup_engine = intel_engine_cleanup;

	} else {

	if (HAS_LOGICAL_RING_CONTEXTS(dev_priv)) {

		dev_priv->gt.resume = intel_lr_context_resume;

		dev_priv->gt.cleanup_engine = intel_logical_ring_cleanup;

	} else {

		dev_priv->gt.resume = intel_legacy_submission_resume;

		dev_priv->gt.cleanup_engine = intel_engine_cleanup;

	}



	/* This is just a security blanket to placate dragons.

CRA Git | Maintained and supported by SUSTech CRA and CCSE