Attachment 94417 Details for Bug 72631 – Fallback to mmio flips

[patch] Fallback to mmio flips

0001-drm-i915-Perform-pageflip-using-mmio-if-the-GPU-is-t.patch (text/plain), 1.54 KB, created by Chris Wilson on 2014-02-20 09:25:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2014-02-20 09:25:51 UTC

Size: 1.54 KB

patch

obsolete

>From 23a15ee604bde60fe0c970565b5c82d7998fc98b Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Thu, 20 Feb 2014 09:22:14 +0000
>Subject: [PATCH] drm/i915: Perform pageflip using mmio if the GPU is
> terminally wedged
>
>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
>

Actions: View | Splinter Review

Attachments on bug 72631: 90689 | 92250 | 94048 | 94292 | 94296 | 94371 | 94412 | 94417 | 94630

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.