* [PATCH] drm/i915: Perform pageflip using mmio if the GPU is terminally wedged
@ 2014-02-20 9:26 Chris Wilson
2014-03-05 13:08 ` Ville Syrjälä
0 siblings, 1 reply; 3+ messages in thread
From: Chris Wilson @ 2014-02-20 9:26 UTC (permalink / raw)
To: intel-gfx
After a hang and failed reset, we cannot use the GPU to execute the page
flip instructions. Instead we can force a synchronous mmio flip. (Later,
we can reduce the synchronicity of the mmio flip by moving some of the
delays off to a worker, like the current page flip code; see vblank
tasks.)
References: https://bugs.freedesktop.org/show_bug.cgi?id=72631
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/intel_display.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 79ef515..d5eafd1 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -8717,6 +8717,9 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
fb->pitches[0] != crtc->fb->pitches[0]))
return -EINVAL;
+ if (i915_terminally_wedged(&dev_priv->gpu_error))
+ goto out_hang;
+
work = kzalloc(sizeof(*work), GFP_KERNEL);
if (work == NULL)
return -ENOMEM;
@@ -8791,6 +8794,13 @@ cleanup:
free_work:
kfree(work);
+ if (ret == -EIO) {
+out_hang:
+ intel_crtc_wait_for_pending_flips(crtc);
+ ret = intel_pipe_set_base(crtc, crtc->x, crtc->y, fb);
+ if (ret == 0 && event)
+ drm_send_vblank_event(dev, intel_crtc->pipe, event);
+ }
return ret;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: Perform pageflip using mmio if the GPU is terminally wedged
2014-02-20 9:26 [PATCH] drm/i915: Perform pageflip using mmio if the GPU is terminally wedged Chris Wilson
@ 2014-03-05 13:08 ` Ville Syrjälä
2014-03-05 13:45 ` Daniel Vetter
0 siblings, 1 reply; 3+ messages in thread
From: Ville Syrjälä @ 2014-03-05 13:08 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
On Thu, Feb 20, 2014 at 09:26:13AM +0000, Chris Wilson wrote:
> After a hang and failed reset, we cannot use the GPU to execute the page
> flip instructions. Instead we can force a synchronous mmio flip. (Later,
> we can reduce the synchronicity of the mmio flip by moving some of the
> delays off to a worker, like the current page flip code; see vblank
> tasks.)
>
> References: https://bugs.freedesktop.org/show_bug.cgi?id=72631
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 79ef515..d5eafd1 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -8717,6 +8717,9 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
> fb->pitches[0] != crtc->fb->pitches[0]))
> return -EINVAL;
>
> + if (i915_terminally_wedged(&dev_priv->gpu_error))
> + goto out_hang;
> +
> work = kzalloc(sizeof(*work), GFP_KERNEL);
> if (work == NULL)
> return -ENOMEM;
> @@ -8791,6 +8794,13 @@ cleanup:
> free_work:
> kfree(work);
>
> + if (ret == -EIO) {
> +out_hang:
> + intel_crtc_wait_for_pending_flips(crtc);
> + ret = intel_pipe_set_base(crtc, crtc->x, crtc->y, fb);
> + if (ret == 0 && event)
> + drm_send_vblank_event(dev, intel_crtc->pipe, event);
> + }
> return ret;
> }
>
> --
> 1.7.9.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: Perform pageflip using mmio if the GPU is terminally wedged
2014-03-05 13:08 ` Ville Syrjälä
@ 2014-03-05 13:45 ` Daniel Vetter
0 siblings, 0 replies; 3+ messages in thread
From: Daniel Vetter @ 2014-03-05 13:45 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx
On Wed, Mar 05, 2014 at 03:08:27PM +0200, Ville Syrjälä wrote:
> On Thu, Feb 20, 2014 at 09:26:13AM +0000, Chris Wilson wrote:
> > After a hang and failed reset, we cannot use the GPU to execute the page
> > flip instructions. Instead we can force a synchronous mmio flip. (Later,
> > we can reduce the synchronicity of the mmio flip by moving some of the
> > delays off to a worker, like the current page flip code; see vblank
> > tasks.)
> >
> > References: https://bugs.freedesktop.org/show_bug.cgi?id=72631
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Queued for -next, thanks for the patch.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-03-05 13:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-20 9:26 [PATCH] drm/i915: Perform pageflip using mmio if the GPU is terminally wedged Chris Wilson
2014-03-05 13:08 ` Ville Syrjälä
2014-03-05 13:45 ` Daniel Vetter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.