diff options
author | Ben Widawsky <ben@bwidawsk.net> | 2012-06-17 12:37:24 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-06-18 04:01:08 -0400 |
commit | e158c5aa1776372cd751e2c395300a3a6ff0bc9c (patch) | |
tree | 083efc56e4f3690917d5660cad008346207d93ec /drivers/gpu/drm/i915/i915_gem_context.c | |
parent | 39fb50f6178d7dbd70142b25193d722ebf3f8193 (diff) |
drm/i915: disable contexts on old HW
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>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_context.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem_context.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 6dc426a48b2..8fb8cd8f632 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c | |||
@@ -243,8 +243,10 @@ void i915_gem_context_init(struct drm_device *dev) | |||
243 | struct drm_i915_private *dev_priv = dev->dev_private; | 243 | struct drm_i915_private *dev_priv = dev->dev_private; |
244 | uint32_t ctx_size; | 244 | uint32_t ctx_size; |
245 | 245 | ||
246 | if (!HAS_HW_CONTEXTS(dev)) | 246 | if (!HAS_HW_CONTEXTS(dev)) { |
247 | dev_priv->hw_contexts_disabled = true; | ||
247 | return; | 248 | return; |
249 | } | ||
248 | 250 | ||
249 | /* If called from reset, or thaw... we've been here already */ | 251 | /* If called from reset, or thaw... we've been here already */ |
250 | if (dev_priv->hw_contexts_disabled || | 252 | if (dev_priv->hw_contexts_disabled || |