WebSVN – Kolibri OS – Diff – /drivers/video/drm/i915/i915_gem_context.c

  * I've seen in a spec to date, and that was a workaround for a non-shipping
  * part. It should be safe to decrease this, but it's more future proof as is.
  */
 #define CONTEXT_ALIGN (64<<10)
-#if 0
 static struct i915_hw_context *
 i915_gem_context_get(struct drm_i915_file_private *file_priv, u32 id);
 static int do_switch(struct i915_hw_context *to);
 		kfree(ctx);
 		DRM_DEBUG_DRIVER("Context object allocated failed\n");
 		return ERR_PTR(-ENOMEM);
+	}
+	if (INTEL_INFO(dev)->gen >= 7) {
+		ret = i915_gem_object_set_cache_level(ctx->obj,
+						      I915_CACHE_LLC_MLC);
+		if (ret)
+			goto err_out;
+	}
 	/* The ring associated with the context object is handled by the normal
 	 * object tracking code. We give an initial ring value simple to pass an
 	 * assertion in the context switch code.
 	 */
 	i915_gem_object_unpin(ctx->obj);
 err_destroy:
 	do_destroy(ctx);
 	return ret;
+}
-#endif
 void i915_gem_context_init(struct drm_device *dev)
+{
-	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct drm_i915_private *dev_priv = dev->dev_private;
 #if 0
 	if (!HAS_HW_CONTEXTS(dev)) {
 		dev_priv->hw_contexts_disabled = true;
 		dev_priv->hw_contexts_disabled = true;
 		return;
+	}
-	DRM_DEBUG_DRIVER("HW context support initialized\n");
-#endif
 	DRM_DEBUG_DRIVER("HW context support initialized\n");
-}
+}
 #if 0
 void i915_gem_context_fini(struct drm_device *dev)
+{
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	if (dev_priv->hw_contexts_disabled)
 		return;
 	/* The only known way to stop the gpu from accessing the hw context is
 	 * to reset it. Do this as the very last operation to avoid confusing
 	 * other code, leading to spurious errors. */
 void i915_gem_context_close(struct drm_device *dev, struct drm_file *file)
+{
 	struct drm_i915_file_private *file_priv = file->driver_priv;
 	mutex_lock(&dev->struct_mutex);
-	idr_for_each(&file_priv->context_idr, context_idr_cleanup, NULL);
+//	idr_for_each(&file_priv->context_idr, context_idr_cleanup, NULL);
 	idr_destroy(&file_priv->context_idr);
 	mutex_unlock(&dev->struct_mutex);
+}
 	ring->last_context_obj = to->obj;
 	to->is_initialized = true;
 	return 0;
-}
 #endif
 /**
  * i915_switch_context() - perform a GPU context switch.
 	struct i915_hw_context *to;
 	if (dev_priv->hw_contexts_disabled)
-		return 0;
 		return 0;
 #if 0
 	if (ring != &dev_priv->ring[RCS])
 		return 0;
 		if (to == NULL)
 			return -ENOENT;
+	}
-	return do_switch(to);
-#endif
-    return 0;
+	return do_switch(to);
+}
 #if 0

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/i915/i915_gem_context.c – Rev 3480 → 3746