drm/i915: disable contexts on old HW
authorBen Widawsky <ben@bwidawsk.net>
Sun, 17 Jun 2012 16:37:24 +0000 (09:37 -0700)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 18 Jun 2012 08:01:08 +0000 (10:01 +0200)
This got dropped as a result of the last round of comments. I didn't
test it on unsupported HW (which this is likely the case).

Note that this prevents hw context from blowing up on any pre-gen6 hw.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=51142
[danvet: Added note and buglink.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_gem_context.c

index 6dc426a48b2d982ef434a2bba2c75d6534a903f8..8fb8cd8f632084cc670041bdaa8770c82defa8c2 100644 (file)
@@ -243,8 +243,10 @@ void i915_gem_context_init(struct drm_device *dev)
        struct drm_i915_private *dev_priv = dev->dev_private;
        uint32_t ctx_size;
 
-       if (!HAS_HW_CONTEXTS(dev))
+       if (!HAS_HW_CONTEXTS(dev)) {
+               dev_priv->hw_contexts_disabled = true;
                return;
+       }
 
        /* If called from reset, or thaw... we've been here already */
        if (dev_priv->hw_contexts_disabled ||