drm/i915: Simplify testing for am-I-the-kernel-context?
The kernel context (dev_priv->kernel_context) is unique in that it is not associated with any user filp - it is the only one with ctx->file_priv == NULL. This is a simpler test than comparing it against dev_priv->kernel_context which involves some pointer dancing. In checking that this is true, we notice that the gvt context is allocating itself a i915_hw_ppgtt it doesn't use and not flagging that its file_priv should be invalid. 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/20170106152013.24684-5-chris@chris-wilson.co.uk
This commit is contained in:
@@ -1974,7 +1974,7 @@ static int intel_ring_context_pin(struct intel_engine_cs *engine,
|
||||
unsigned int flags;
|
||||
|
||||
flags = 0;
|
||||
if (ctx == ctx->i915->kernel_context)
|
||||
if (i915_gem_context_is_kernel(ctx))
|
||||
flags = PIN_HIGH;
|
||||
|
||||
ret = context_pin(ctx, flags);
|
||||
@@ -1989,7 +1989,7 @@ static int intel_ring_context_pin(struct intel_engine_cs *engine,
|
||||
* as during eviction we cannot allocate and pin the renderstate in
|
||||
* order to initialise the context.
|
||||
*/
|
||||
if (ctx == ctx->i915->kernel_context)
|
||||
if (i915_gem_context_is_kernel(ctx))
|
||||
ce->initialised = true;
|
||||
|
||||
i915_gem_context_get(ctx);
|
||||
|
Reference in New Issue
Block a user