drm/i915: Add buffer to inactive list immediately during fault

If we failed to set the domain, the buffer was no longer being tracked
on any list.

Cc: stable@kernel.org
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index f0f6f66..441088b 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/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;
                }
                        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;
                }
 
                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? */
        }
 
        /* Need a new fence register? */