Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4960aaca authored by Chris Wilson's avatar Chris Wilson Committed by Jesse Barnes
Browse files

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: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent c1a1cdc1

drivers/gpu/drm/i915/i915_gem.c

+1 −2
Original line number Diff line number Diff line
@@ -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? */