From 190586b5aca815c2535ed5d49b085dc223f3f5b5 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 4 Feb 2009 14:15:10 +0000 Subject: [PATCH] --- yaml --- r: 131146 b: refs/heads/master c: 7d8d58b23fd01e60ed44d8d8c10b2df86e638faa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 68b1f2c57776..2262d5db11cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 122ee2a63bc49d21f402f6b6d2208306cdcc98c1 +refs/heads/master: 7d8d58b23fd01e60ed44d8d8c10b2df86e638faa diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c index 6a9e3a875083..1441831fa06e 100644 --- a/trunk/drivers/gpu/drm/i915/i915_gem.c +++ b/trunk/drivers/gpu/drm/i915/i915_gem.c @@ -588,8 +588,10 @@ int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf) if (obj_priv->fence_reg == I915_FENCE_REG_NONE && obj_priv->tiling_mode != I915_TILING_NONE) { ret = i915_gem_object_get_fence_reg(obj, write); - if (ret != 0) + if (ret) { + mutex_unlock(&dev->struct_mutex); return VM_FAULT_SIGBUS; + } } pfn = ((dev->agp->base + obj_priv->gtt_offset) >> PAGE_SHIFT) +