diff options
| author | Daniel Vetter | 2012-03-26 22:37:04 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2012-04-09 18:04:08 +0200 |
| commit | f534bc0b2212f3dc317bdaea5dfff13526f2ac17 (patch) | |
| tree | 2ef377d7efcdf32d0555c3bafe7649aed77cae37 /drivers/gpu | |
| parent | drm/i915: refuse to load on gen6+ without kms (diff) | |
| download | kernel-qcow2-linux-f534bc0b2212f3dc317bdaea5dfff13526f2ac17.tar.gz kernel-qcow2-linux-f534bc0b2212f3dc317bdaea5dfff13526f2ac17.tar.xz kernel-qcow2-linux-f534bc0b2212f3dc317bdaea5dfff13526f2ac17.zip | |
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')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 4 |
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, (args->gtt_end | args->gtt_start) & (PAGE_SIZE - 1)) return -EINVAL; + /* GEM with user mode setting was never supported on ilk and later. */ + if (INTEL_INFO(dev)->gen >= 5) + return -ENODEV; + mutex_lock(&dev->struct_mutex); i915_gem_init_global_gtt(dev, args->gtt_start, args->gtt_end, args->gtt_end); |