From eb06ae6efa53cf531893dc86b6708143c5f64493 Mon Sep 17 00:00:00 2001
From: Ben Widawsky <ben@bwidawsk.net>
Date: Mon, 11 Feb 2013 13:31:27 -0800
Subject: [PATCH] --- yaml --- r: 358205 b: refs/heads/master c:
 f73f760725636b9d0c3786273e185b053516d1eb h: refs/heads/master i:   358203:
 d489ce50c36352215dd3d3daf321dce271c2b646 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/gpu/drm/i915/i915_gem_context.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 5957284e9145..1c255019a1b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fc7c971c3aedf937f824c063d698779d25c3330
+refs/heads/master: f73f760725636b9d0c3786273e185b053516d1eb
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem_context.c b/trunk/drivers/gpu/drm/i915/i915_gem_context.c
index e7ecafa8e598..21177d9df423 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem_context.c
@@ -126,13 +126,8 @@ static int get_context_size(struct drm_device *dev)
 
 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->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);