summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/i915/i915_gem.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-12-18 16:30:22 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-12-18 16:30:22 +0100
commit02f6bcccf7c324115747aae2f0addd6af5d321cd (patch)
tree86d9c6e02e1579046865c92750a4c51c5bb2b5ff /drivers/gpu/drm/i915/i915_gem.c
parent1c60fef535d143860d5bf6593e24ab6417f5227c (diff)
downloadlwn-02f6bcccf7c324115747aae2f0addd6af5d321cd.tar.gz
lwn-02f6bcccf7c324115747aae2f0addd6af5d321cd.zip
drm/i915: Reject the pin ioctl on gen6+
Especially with ppgtt this kinda stopped making sense. And if we indeed need this to hack around an issue, we need something that also works for non-root. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index f3b0025998db..9ff350965753 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3916,6 +3916,9 @@ i915_gem_pin_ioctl(struct drm_device *dev, void *data,
struct drm_i915_gem_object *obj;
int ret;
+ if (INTEL_INFO(dev)->gen >= 6)
+ return -ENODEV;
+
ret = i915_mutex_lock_interruptible(dev);
if (ret)
return ret;