aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_gem.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2012-03-26 16:37:04 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-04-09 12:04:08 -0400
commitf534bc0b2212f3dc317bdaea5dfff13526f2ac17 (patch)
tree2ef377d7efcdf32d0555c3bafe7649aed77cae37 /drivers/gpu/drm/i915/i915_gem.c
parent26394d9251879231b85e6c8cf899fa43e75c68f1 (diff)
drm/i915: disallow gem init ioctl on ilk
Ums is already disabled, but on ilk we can additionally disable gem initialization when using user mode setting. Upstream never support ilk without kernel modesetting and not even the RHEL ilk ums backport needs gem - that driver is based on xf86-video-intel version 2.2, which is pre-gem. Reviewed-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> 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.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 54ca125a405d..759daa491ab5 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -129,6 +129,10 @@ i915_gem_init_ioctl(struct drm_device *dev, void *data,
129 (args->gtt_end | args->gtt_start) & (PAGE_SIZE - 1)) 129 (args->gtt_end | args->gtt_start) & (PAGE_SIZE - 1))
130 return -EINVAL; 130 return -EINVAL;
131 131
132 /* GEM with user mode setting was never supported on ilk and later. */
133 if (INTEL_INFO(dev)->gen >= 5)
134 return -ENODEV;
135
132 mutex_lock(&dev->struct_mutex); 136 mutex_lock(&dev->struct_mutex);
133 i915_gem_init_global_gtt(dev, args->gtt_start, 137 i915_gem_init_global_gtt(dev, args->gtt_start,
134 args->gtt_end, args->gtt_end); 138 args->gtt_end, args->gtt_end);