Attachment 80719 Details for Bug 65495 – Ignore EIO during set-to-domain

[patch] Ignore EIO during set-to-domain

0001-drm-i915-Ignore-EIO-whilst-waiting-without-the-lock.patch (text/plain), 1.33 KB, created by Chris Wilson on 2013-06-12 10:04:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2013-06-12 10:04:39 UTC

Size: 1.33 KB

patch

obsolete

>From d3ccd3c44b24e5a524fe9035c01ec84095f2bae5 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Wed, 12 Jun 2013 10:34:21 +0100
>Subject: [PATCH] drm/i915: Ignore EIO whilst waiting without the lock
>
>As we play games in set-to-domain in order to first perform a lockless
>wait on outstanding rendering, it is possible that we report a spurious
>GPU hang during that wait. After reclaiming the lock we then want to do
>a more thorough test as to whether the hang is indeed fatal and what the
>correct error code we should return. This naturally falls out of the
>locked wait we perform as the second task in set-to-domain.
>
>References: https://bugs.freedesktop.org/show_bug.cgi?id=65495
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/i915/i915_gem.c |    2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
>index 773c8f4..70fe8a1 100644
>--- a/drivers/gpu/drm/i915/i915_gem.c
>+++ b/drivers/gpu/drm/i915/i915_gem.c
>@@ -1214,7 +1214,7 @@ i915_gem_set_domain_ioctl(struct drm_device *dev, void *data,
> 	 * to catch cases where we are gazumped.
> 	 */
> 	ret = i915_gem_object_wait_rendering__nonblocking(obj, !write_domain);
>-	if (ret)
>+	if (ret && ret != -EIO)
> 		goto unref;
> 
> 	if (read_domains & I915_GEM_DOMAIN_GTT) {
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 65495: 80719 | 80754 | 81830 | 81860

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.