diff options
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 6a9e3a875083..1441831fa06e 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
@@ -588,8 +588,10 @@ int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
588 | if (obj_priv->fence_reg == I915_FENCE_REG_NONE && | 588 | if (obj_priv->fence_reg == I915_FENCE_REG_NONE && |
589 | obj_priv->tiling_mode != I915_TILING_NONE) { | 589 | obj_priv->tiling_mode != I915_TILING_NONE) { |
590 | ret = i915_gem_object_get_fence_reg(obj, write); | 590 | ret = i915_gem_object_get_fence_reg(obj, write); |
591 | if (ret != 0) | 591 | if (ret) { |
592 | mutex_unlock(&dev->struct_mutex); | ||
592 | return VM_FAULT_SIGBUS; | 593 | return VM_FAULT_SIGBUS; |
594 | } | ||
593 | } | 595 | } |
594 | 596 | ||
595 | pfn = ((dev->agp->base + obj_priv->gtt_offset) >> PAGE_SHIFT) + | 597 | pfn = ((dev->agp->base + obj_priv->gtt_offset) >> PAGE_SHIFT) + |