| From 7c349470fb8a613d0661c8f5e4e8276db1969f50 Mon Sep 17 00:00:00 2001 |
| From: Daniel Vetter <daniel.vetter@ffwll.ch> |
| Date: Thu, 12 Sep 2013 17:57:28 +0200 |
| Subject: 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: Peter Zijlstra <peterz@infradead.org> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org> |
| Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> |
| Acked-by: Peter Zijlstra <peterz@infradead.org> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit 571c608d06df2d50233263d233a32edab1842865) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/i915_gem.c | 11 ++++------- |
| 1 file changed, 4 insertions(+), 7 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c |
| index bc85c48e856f..3d3de6eba1e8 100644 |
| --- a/drivers/gpu/drm/i915/i915_gem.c |
| +++ b/drivers/gpu/drm/i915/i915_gem.c |
| @@ -1389,14 +1389,11 @@ out: |
| 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: |
| -- |
| 1.8.5.rc3 |
| |
