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

Commit 571c608d authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: kill set_need_resched 



This is just a remnant from the old days when our reset handling was
horribly racy, suffered from terribly locking issues and often happily
live-locked. Those days are now gone so we can drop the hacks and just
rip the reschedule-point out.

Reported-by: default avatarPeter Zijlstra <peterz@infradead.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 0d971748

drivers/gpu/drm/i915/i915_gem.c

+4 −7
Original line number Diff line number Diff line
@@ -1390,14 +1390,11 @@ int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
		if (i915_terminally_wedged(&dev_priv->gpu_error))

			return VM_FAULT_SIGBUS;

	case -EAGAIN:

		/* Give the error handler a chance to run and move the

		 * objects off the GPU active list. Next time we service the

		 * fault, we should be able to transition the page into the

		 * GTT without touching the GPU (and so avoid further

		 * EIO/EGAIN). If the GPU is wedged, then there is no issue

		 * with coherency, just lost writes.

		/*

		 * EAGAIN means the gpu is hung and we'll wait for the error

		 * handler to reset everything when re-faulting in

		 * i915_mutex_lock_interruptible.

		 */

		set_need_resched();

	case 0:

	case -ERESTARTSYS:

	case -EINTR: