From a87098bf6f1d495a7257c37dfc0f3a1e9db40986 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 14 Sep 2009 16:50:25 +0100 Subject: [PATCH] --- yaml --- r: 166011 b: refs/heads/master c: 4960aaca14010b9ff92e5726dd178cbd6805d412 h: refs/heads/master i: 166009: 209018935f115d7dc574c7c4b5e10996abdd5098 166007: 777983df536586c58cab241a694afe115018905c v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 06c1fcf64685..c1396c03d3fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c1a1cdc159e211f045290f61ac95092e9708f5bc +refs/heads/master: 4960aaca14010b9ff92e5726dd178cbd6805d412 diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c index f0f6f668a61e..441088b37d9f 100644 --- a/trunk/drivers/gpu/drm/i915/i915_gem.c +++ b/trunk/drivers/gpu/drm/i915/i915_gem.c @@ -1160,14 +1160,13 @@ int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf) mutex_unlock(&dev->struct_mutex); return VM_FAULT_SIGBUS; } + list_add_tail(&obj_priv->list, &dev_priv->mm.inactive_list); ret = i915_gem_object_set_to_gtt_domain(obj, write); if (ret) { mutex_unlock(&dev->struct_mutex); return VM_FAULT_SIGBUS; } - - list_add_tail(&obj_priv->list, &dev_priv->mm.inactive_list); } /* Need a new fence register? */