It's not that the assertion is incorrect, but rather that we can call
do_destroy early in loading, and we will falsely BUG().
Since contexts have been in for a while now, and in the internal APIs
are pretty stable, it should be fairly safe to remove this.
v2: Remove unused dev_priv, and dev
Signed-off-by: Ben Widawsky b...@bwidawsk.net
---
drivers/gpu/drm/i915/i915_gem_context.c | 5 -
1 file changed, 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c
b/drivers/gpu/drm/i915/i915_gem_context.c
index 2c9a6bc..2a79749 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -135,9 +135,6 @@ static int get_context_size(struct drm_device *dev, bool
advanced)
static void do_destroy(struct i915_hw_context *ctx)
{
- struct drm_device *dev = ctx-obj-base.dev;
- struct drm_i915_private *dev_priv = dev-dev_private;
-
if (ctx-ring_obj) {
i915_gem_object_unpin(ctx-ring_obj);
drm_gem_object_unreference(ctx-ring_obj-base);
@@ -145,8 +142,6 @@ static void do_destroy(struct i915_hw_context *ctx)
if (ctx-file_priv)
idr_remove(ctx-file_priv-context_idr, ctx-id);
- else
- BUG_ON(ctx != dev_priv-ring[RCS].default_context);
drm_gem_object_unreference(ctx-obj-base);
kfree(ctx);
--
1.8.1.3
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
