diff options
| author | Daniel Vetter | 2014-08-06 15:04:50 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-08-13 14:23:30 +0200 |
| commit | 6c5566a82c6fb1da9e13a294f23d4cd85a08cb30 (patch) | |
| tree | d638eae64353aaffc595170bc9b6b26483d6735f /drivers/gpu/drm/i915/i915_gem.c | |
| parent | drm/i915: Add proper prefix to obj_to_ggtt (diff) | |
| download | kernel-qcow2-linux-6c5566a82c6fb1da9e13a294f23d4cd85a08cb30.tar.gz kernel-qcow2-linux-6c5566a82c6fb1da9e13a294f23d4cd85a08cb30.tar.xz kernel-qcow2-linux-6c5566a82c6fb1da9e13a294f23d4cd85a08cb30.zip | |
drm/i915: Allow i915_gem_setup_global_gtt to fail
We already needs this just as a safety check in case the preallocation
reservation dance fails. But we definitely need this to be able to
move tha aliasing ppgtt setup back out of the context code to this
place, where it belongs.
Reviewed-by: Michel Thierry <michel.thierry@intel.com>
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.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index c9d1396781e2..c8404a439502 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -4754,7 +4754,12 @@ int i915_gem_init(struct drm_device *dev) dev_priv->gt.stop_ring = intel_logical_ring_stop; } - i915_gem_init_userptr(dev); + ret = i915_gem_init_userptr(dev); + if (ret) { + mutex_unlock(&dev->struct_mutex); + return ret; + } + i915_gem_init_global_gtt(dev); ret = i915_gem_context_init(dev); |