Attachment 44989 Details for Bug 35733 – An ugly hack

[patch] An ugly hack

0001-An-ugly-hack-to-keep-trying-the-fast-path.patch (text/plain), 1.24 KB, created by Chris Wilson on 2011-03-29 02:38:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2011-03-29 02:38:23 UTC

Size: 1.24 KB

patch

obsolete

>From ba15546819c31c8e257cf8c0bd9203d8e524edbf Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Tue, 29 Mar 2011 10:36:29 +0100
>Subject: [PATCH] An ugly hack to keep trying the fast path
>
>---
> drivers/gpu/drm/i915/i915_gem_execbuffer.c |   10 +++++++++-
> 1 files changed, 9 insertions(+), 1 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
>index b6f89f9..dd03d74 100644
>--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
>+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
>@@ -368,7 +368,7 @@ i915_gem_execbuffer_relocate_entry(struct drm_i915_gem_object *obj,
> 
> 		/* We can't wait for rendering with pagefaults disabled */
> 		if (obj->active && in_atomic())
>-			return -EFAULT;
>+			return -EDEADLK;
> 
> 		ret = i915_gem_object_set_to_gtt_domain(obj, 1);
> 		if (ret)
>@@ -460,7 +460,15 @@ i915_gem_execbuffer_relocate(struct drm_device *dev,
> 	 */
> 	pagefault_disable();
> 	list_for_each_entry(obj, objects, exec_list) {
>+repeat:
> 		ret = i915_gem_execbuffer_relocate_object(obj, eb);
>+		if (ret == -EDEADLK) {
>+			pagefault_enable();
>+			ret = i915_gem_object_flush_gpu(obj);
>+			pagefault_disable();
>+			if (ret == 0)
>+				goto repeat;
>+		}
> 		if (ret)
> 			break;
> 	}
>-- 
>1.7.4.1
>

Actions: View | Splinter Review

Attachments on bug 35733: 44980 | 44981 | 44983 | 44985 | 44988 | 44989

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.