diff options
| author | Gordon Ross <gordon.w.ross@gmail.com> | 2016-10-28 21:29:32 -0400 |
|---|---|---|
| committer | Gordon Ross <gordon.w.ross@gmail.com> | 2016-11-22 21:55:25 -0500 |
| commit | 02167e5266a5aecd4fcf8ab713e88c8a91efd314 (patch) | |
| tree | 78db51fd0dde57c008a5ce4791c097d563f1f339 /usr/src/uts/intel/io/i915/i915_gem.c | |
| parent | 34389f68da0422c10aa2f4edac7a44021b5f4cc8 (diff) | |
| download | illumos-gfx-drm-02167e5266a5aecd4fcf8ab713e88c8a91efd314.tar.gz | |
Fix crashes to do with missing scratch_page
Fix panic in i915_gem_context_fini
Diffstat (limited to 'usr/src/uts/intel/io/i915/i915_gem.c')
| -rw-r--r-- | usr/src/uts/intel/io/i915/i915_gem.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr/src/uts/intel/io/i915/i915_gem.c b/usr/src/uts/intel/io/i915/i915_gem.c index de59d85..4c89a79 100644 --- a/usr/src/uts/intel/io/i915/i915_gem.c +++ b/usr/src/uts/intel/io/i915/i915_gem.c @@ -3599,7 +3599,11 @@ int i915_gem_init(struct drm_device *dev) DRM_DEBUG_DRIVER("allow wake ack timed out\n"); } - i915_gem_init_global_gtt(dev); + ret = i915_gem_init_global_gtt(dev); + if (ret) { + mutex_unlock(&dev->struct_mutex); + return ret; + } size = drm_getfb_size(dev); dev_priv->fbcon_obj = NULL; |