drm/i915: Piggy back hangstats off of contexts
To simplify the codepaths somewhat, we can simply always create a
context. Contexts already keep hangstat information. This prevents us
from having to differentiate at other parts in the code.
There is allocation overhead, but it should not be measurable.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index d5d35e2..192a259 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -490,15 +490,8 @@
struct drm_file *file,
u32 id)
{
- struct drm_i915_file_private *file_priv = file->driver_priv;
struct i915_hw_context *ctx;
- if (id == DEFAULT_CONTEXT_ID)
- return &file_priv->hang_stats;
-
- if (!HAS_HW_CONTEXTS(dev))
- return ERR_PTR(-ENOENT);
-
ctx = i915_gem_context_get(file->driver_priv, id);
if (ctx == NULL)
return ERR_PTR(-ENOENT);
@@ -509,9 +502,15 @@
int i915_gem_context_open(struct drm_device *dev, struct drm_file *file)
{
struct drm_i915_file_private *file_priv = file->driver_priv;
+ struct drm_i915_private *dev_priv = dev->dev_private;
- if (!HAS_HW_CONTEXTS(dev))
+ if (!HAS_HW_CONTEXTS(dev)) {
+ /* Cheat for hang stats */
+ file_priv->private_default_ctx =
+ kzalloc(sizeof(struct i915_hw_context), GFP_KERNEL);
+ file_priv->private_default_ctx->vm = &dev_priv->gtt.base;
return 0;
+ }
idr_init(&file_priv->context_idr);
@@ -532,8 +531,10 @@
{
struct drm_i915_file_private *file_priv = file->driver_priv;
- if (!HAS_HW_CONTEXTS(dev))
+ if (!HAS_HW_CONTEXTS(dev)) {
+ kfree(file_priv->private_default_ctx);
return;
+ }
mutex_lock(&dev->struct_mutex);
idr_for_each(&file_priv->context_idr, context_idr_cleanup, NULL);
@@ -714,9 +715,6 @@
WARN_ON(!mutex_is_locked(&dev_priv->dev->struct_mutex));
- if (!HAS_HW_CONTEXTS(ring->dev))
- return 0;
-
if (file == NULL)
to = ring->default_context;
else
@@ -725,6 +723,10 @@
if (to == NULL)
return -ENOENT;
+ /* We have the fake context, but don't supports switching. */
+ if (!HAS_HW_CONTEXTS(ring->dev))
+ return 0;
+
return do_switch(ring, to);
}