drm/i915: return -ENODEV if hw context are not supported
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 19 Jun 2012 15:16:01 +0000 (17:16 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 20 Jun 2012 09:19:20 +0000 (11:19 +0200)
Otherwise userspace has no way to figure this out.

Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_gem_context.c

index 1b5041c52569f98ea6455eddc3c53f78b38a6e53..e58e8366f473aef88de141ff94d7f2d204225827 100644 (file)
@@ -480,6 +480,7 @@ int i915_switch_context(struct intel_ring_buffer *ring,
 int i915_gem_context_create_ioctl(struct drm_device *dev, void *data,
                                  struct drm_file *file)
 {
+       struct drm_i915_private *dev_priv = dev->dev_private;
        struct drm_i915_gem_context_create *args = data;
        struct drm_i915_file_private *file_priv = file->driver_priv;
        struct i915_hw_context *ctx;
@@ -488,6 +489,9 @@ int i915_gem_context_create_ioctl(struct drm_device *dev, void *data,
        if (!(dev->driver->driver_features & DRIVER_GEM))
                return -ENODEV;
 
+       if (dev_priv->hw_contexts_disabled)
+               return -ENODEV;
+
        ret = i915_mutex_lock_interruptible(dev);
        if (ret)
                return ret;