Commit 3fed1808 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Move the scheduler feature bits into the purview of the engines 



Rather than having the high level ioctl interface guess the underlying
implementation details, having the implementation declare what
capabilities it exports. We define an intel_driver_caps, similar to the
intel_device_info, which instead of trying to describe the HW gives
details on what the driver itself supports. This is then populated by
the engine backend for the new scheduler capability field for use
elsewhere.

v2: Use caps.scheduler for validating CONTEXT_PARAM_SET_PRIORITY (Mika)
    One less assumption of engine[RCS] \o/

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Tomasz Lis <tomasz.lis@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: default avatarTomasz Lis <tomasz.lis@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180207210544.26351-2-chris@chris-wilson.co.uk


Reviewed-by: default avatarMichel Thierry <michel.thierry@intel.com>
parent e78c9175

drivers/gpu/drm/i915/i915_debugfs.c

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ static int i915_capabilities(struct seq_file *m, void *data) 


	intel_device_info_dump_flags(info, &p);

	intel_device_info_dump_runtime(info, &p);

	intel_driver_caps_print(&dev_priv->caps, &p);



	kernel_param_lock(THIS_MODULE);

	i915_params_dump(&i915_modparams, &p);

drivers/gpu/drm/i915/i915_drv.c

+1 −7
Original line number Diff line number Diff line
@@ -381,13 +381,7 @@ static int i915_getparam(struct drm_device *dev, void *data, 
		value = i915_gem_mmap_gtt_version();

		break;

	case I915_PARAM_HAS_SCHEDULER:

		value = 0;

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

				value |= I915_SCHEDULER_CAP_PREEMPTION;

		}

		value = dev_priv->caps.scheduler;

		break;



	case I915_PARAM_MMAP_VERSION:

drivers/gpu/drm/i915/i915_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -472,6 +472,7 @@ struct i915_gpu_state { 
	u32 reset_count;

	u32 suspend_count;

	struct intel_device_info device_info;

	struct intel_driver_caps driver_caps;

	struct i915_params params;



	struct i915_error_uc {
@@ -1815,6 +1816,7 @@ struct drm_i915_private { 
	struct kmem_cache *priorities;



	const struct intel_device_info info;

	struct intel_driver_caps caps;



	/**

	 * Data Stolen Memory - aka "i915 stolen memory" gives us the start and

drivers/gpu/drm/i915/i915_gem.c

+3 −0
Original line number Diff line number Diff line
@@ -3229,8 +3229,11 @@ void i915_gem_set_wedged(struct drm_i915_private *i915) 
		 * start to complete all requests.

		 */

		engine->submit_request = nop_complete_submit_request;

		engine->schedule = NULL;

	}



	i915->caps.scheduler = 0;



	/*

	 * Make sure no request can slip through without getting completed by

	 * either this call here to intel_engine_init_global_seqno, or the one

drivers/gpu/drm/i915/i915_gem_context.c

+1 −1
Original line number Diff line number Diff line
@@ -807,7 +807,7 @@ int i915_gem_context_setparam_ioctl(struct drm_device *dev, void *data, 


			if (args->size)

				ret = -EINVAL;

			else if (!to_i915(dev)->engine[RCS]->schedule)

			else if (!(to_i915(dev)->caps.scheduler & I915_SCHEDULER_CAP_PRIORITY))

				ret = -ENODEV;

			else if (priority > I915_CONTEXT_MAX_USER_PRIORITY ||

				 priority < I915_CONTEXT_MIN_USER_PRIORITY)

CRA Git | Maintained and supported by SUSTech CRA and CCSE