[Intel-gfx] [PATCH 1/2] drm/i915: kill set_need_resched
Rob Clark
robdclark at gmail.com
Thu Sep 12 17:59:16 PDT 2013
hmm, looks like I cargo-cult'd the same into msm.
I guess in i915 (and ttm) case, the issue arises due to need for CPU
access to buffer via GTT? In which case I should be safe to drop the
set_need_resched() as well? (Since CPU always has direct access to the
pages.) Or am I missing something about the original issue that
necessitated set_need_resched()?
BR,
-R
On Thu, Sep 12, 2013 at 11:57 AM, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> 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 at infradead.org>
> Cc: Peter Zijlstra <peterz at infradead.org>
> Cc: Linux Kernel Mailing List <linux-kernel at vger.kernel.org>
> Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> ---
> 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 d80f33d..3871060 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.4.rc3
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
More information about the dri-devel
mailing list