Since moving the bannable boolean into the context flags, we lost the default setting of contexts being bannable. Oops.
Sadly because we have multi-level banning scheme, our testcase for being banned cannot distinguish between the expected ban on the context and the applied banned via the fd.
Fixes: 6095868a271d ("drm/i915: Complete kerneldoc for struct i915_gem_context") Signed-off-by: Chris Wilson chris@chris-wilson.co.uk Cc: Mika Kuoppala mika.kuoppala@linux.intel.com Cc: stable@vger.kernel.org # v4.11+ --- drivers/gpu/drm/i915/i915_gem_context.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 280813a4bf82..102866967998 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -364,6 +364,7 @@ __create_hw_context(struct drm_i915_private *dev_priv, list_add_tail(&ctx->link, &dev_priv->contexts.list); ctx->i915 = dev_priv; ctx->sched.priority = I915_USER_PRIORITY(I915_PRIORITY_NORMAL); + ctx->user_flags = BIT(UCONTEXT_BANNABLE);
for (n = 0; n < ARRAY_SIZE(ctx->__engine); n++) intel_context_init(&ctx->__engine[n], ctx, dev_priv->engine[n]);
Chris Wilson chris@chris-wilson.co.uk writes:
Since moving the bannable boolean into the context flags, we lost the default setting of contexts being bannable. Oops.
Sadly because we have multi-level banning scheme, our testcase for being banned cannot distinguish between the expected ban on the context and the applied banned via the fd.
Fixes: 6095868a271d ("drm/i915: Complete kerneldoc for struct i915_gem_context") Signed-off-by: Chris Wilson chris@chris-wilson.co.uk Cc: Mika Kuoppala mika.kuoppala@linux.intel.com Cc: stable@vger.kernel.org # v4.11+
drivers/gpu/drm/i915/i915_gem_context.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 280813a4bf82..102866967998 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -364,6 +364,7 @@ __create_hw_context(struct drm_i915_private *dev_priv, list_add_tail(&ctx->link, &dev_priv->contexts.list); ctx->i915 = dev_priv; ctx->sched.priority = I915_USER_PRIORITY(I915_PRIORITY_NORMAL);
- ctx->user_flags = BIT(UCONTEXT_BANNABLE);
But it is there, after setting the ring size.
-Mika
for (n = 0; n < ARRAY_SIZE(ctx->__engine); n++) intel_context_init(&ctx->__engine[n], ctx, dev_priv->engine[n]); -- 2.20.1
Quoting Mika Kuoppala (2019-02-18 10:45:32)
Chris Wilson chris@chris-wilson.co.uk writes:
Since moving the bannable boolean into the context flags, we lost the default setting of contexts being bannable. Oops.
Sadly because we have multi-level banning scheme, our testcase for being banned cannot distinguish between the expected ban on the context and the applied banned via the fd.
Fixes: 6095868a271d ("drm/i915: Complete kerneldoc for struct i915_gem_context") Signed-off-by: Chris Wilson chris@chris-wilson.co.uk Cc: Mika Kuoppala mika.kuoppala@linux.intel.com Cc: stable@vger.kernel.org # v4.11+
drivers/gpu/drm/i915/i915_gem_context.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 280813a4bf82..102866967998 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -364,6 +364,7 @@ __create_hw_context(struct drm_i915_private *dev_priv, list_add_tail(&ctx->link, &dev_priv->contexts.list); ctx->i915 = dev_priv; ctx->sched.priority = I915_USER_PRIORITY(I915_PRIORITY_NORMAL);
ctx->user_flags = BIT(UCONTEXT_BANNABLE);But it is there, after setting the ring size.
Hmm. However my mesa context didn't get banned until the fd did, which is not what was intended. Odd.
So which is preferrable setting user_flags explicitly or using the helper, probably the latter since that's the style we already have. -Chris
linux-stable-mirror@lists.linaro.org
-
Chris Wilson -
Mika Kuoppala