aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2012-04-24 02:22:52 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-05-03 05:18:13 -0400
commit7bb6fb8dd958ae773ac205282e3c0b56c22e01ed (patch)
tree3e70a0b93994fd6c03447943dee442b847176b8f
parent1cff8f6b4c668a060c7e3f82d3f1fb5aaa37edc4 (diff)
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 b402d70dc78b..1b808d041949 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,
140{ 140{
141 struct drm_i915_gem_init *args = data; 141 struct drm_i915_gem_init *args = data;
142 142
143 if (drm_core_check_feature(dev, DRIVER_MODESET))
144 return -ENODEV;
145
143 if (args->gtt_start >= args->gtt_end || 146 if (args->gtt_start >= args->gtt_end ||
144 (args->gtt_end | args->gtt_start) & (PAGE_SIZE - 1)) 147 (args->gtt_end | args->gtt_start) & (PAGE_SIZE - 1))
145 return -EINVAL; 148 return -EINVAL;