--- a/open-src/kernel/i915/src/i915_gem_context.c	Wed Nov 05 07:58:34 2014 -0800
+++ b/open-src/kernel/i915/src/i915_gem_context.c	Tue Jun 09 21:02:14 2015 -0700
@@ -30,7 +30,7 @@
  */
 
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*
@@ -291,7 +291,7 @@
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct i915_hw_context *dctx = dev_priv->ring[RCS].default_context;
 
-	if (dev_priv->hw_contexts_disabled)
+	if (dev_priv->hw_contexts_disabled || dctx == NULL)
 		return;
 
 	/* The only known way to stop the gpu from accessing the hw context is