summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2012-04-24 06:22:52 (GMT)
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-05-03 09:18:13 (GMT)
commit7bb6fb8dd958ae773ac205282e3c0b56c22e01ed (patch)
tree3e70a0b93994fd6c03447943dee442b847176b8f
parent1cff8f6b4c668a060c7e3f82d3f1fb5aaa37edc4 (diff)
downloadlinux-fsl-qoriq-7bb6fb8dd958ae773ac205282e3c0b56c22e01ed.tar.xz
drm/i915: disallow gem ums init ioctl for kms
This ioctl used in a kms driver is only useful to create massive havoc. v2: Bail out with -ENODEV as suggested by Chris Wilson. Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-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 b402d70..1b808d0 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -140,6 +140,9 @@ i915_gem_init_ioctl(struct drm_device *dev, void *data,
{
struct drm_i915_gem_init *args = data;
+ if (drm_core_check_feature(dev, DRIVER_MODESET))
+ return -ENODEV;
+
if (args->gtt_start >= args->gtt_end ||
(args->gtt_end | args->gtt_start) & (PAGE_SIZE - 1))
return -EINVAL;