Selaa lähdekoodia

drm/i915: Store the execution priority on the context

In order to support userspace defining different levels of importance to
different contexts, and in particular the preferred order of execution,
store a priority value on each context. By default, the kernel's
context, which is used for idling and other background tasks, is given
minimum priority (i.e. all user contexts will execute before the kernel).

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161114204105.29171-9-chris@chris-wilson.co.uk
Chris Wilson 8 vuotta sitten
vanhempi
commit
9f792ebafe

+ 1 - 0
drivers/gpu/drm/i915/i915_drv.h

@@ -936,6 +936,7 @@ struct i915_gem_context {
 	/* Unique identifier for this context, used by the hw for tracking */
 	/* Unique identifier for this context, used by the hw for tracking */
 	unsigned int hw_id;
 	unsigned int hw_id;
 	u32 user_handle;
 	u32 user_handle;
+	int priority; /* greater priorities are serviced first */
 
 
 	u32 ggtt_alignment;
 	u32 ggtt_alignment;
 
 

+ 1 - 0
drivers/gpu/drm/i915/i915_gem_context.c

@@ -476,6 +476,7 @@ int i915_gem_context_init(struct drm_device *dev)
 		return PTR_ERR(ctx);
 		return PTR_ERR(ctx);
 	}
 	}
 
 
+	ctx->priority = I915_PRIORITY_MIN; /* lowest priority; idle task */
 	dev_priv->kernel_context = ctx;
 	dev_priv->kernel_context = ctx;
 
 
 	DRM_DEBUG_DRIVER("%s context support initialized\n",
 	DRM_DEBUG_DRIVER("%s context support initialized\n",

+ 1 - 1
drivers/gpu/drm/i915/i915_gem_request.c

@@ -867,7 +867,7 @@ void __i915_add_request(struct drm_i915_gem_request *request, bool flush_caches)
 	 * run at the earliest possible convenience.
 	 * run at the earliest possible convenience.
 	 */
 	 */
 	if (engine->schedule)
 	if (engine->schedule)
-		engine->schedule(request, 0);
+		engine->schedule(request, request->ctx->priority);
 
 
 	local_bh_disable();
 	local_bh_disable();
 	i915_sw_fence_commit(&request->submit);
 	i915_sw_fence_commit(&request->submit);