[arch-commits] Commit in linux/repos/core-i686 (i915-gpu-finish.patch linux.install)

[Tobias Powalowski]

    Date: Friday, April 6, 2012 @ 06:38:30
  Author: tpowa
Revision: 155772

bump to latest version

Modified:
  linux/repos/core-i686/linux.install
Deleted:
  linux/repos/core-i686/i915-gpu-finish.patch

-----------------------+
 i915-gpu-finish.patch |   55 ------------------------------------------------
 linux.install         |    2 -
 2 files changed, 1 insertion(+), 56 deletions(-)

Deleted: i915-gpu-finish.patch
===================================================================
--- i915-gpu-finish.patch	2012-04-06 10:09:10 UTC (rev 155771)
+++ i915-gpu-finish.patch	2012-04-06 10:38:30 UTC (rev 155772)
@@ -1,55 +0,0 @@
-commit 389a55581e30607af0fcde6cdb4e54f189cf46cf
-Author: Chris Wilson <chris at chris-wilson.co.uk>
-Date:   Tue Nov 29 15:12:16 2011 +0000
-
-    drm/i915: Only clear the GPU domains upon a successful finish
-    
-    By clearing the GPU read domains before waiting upon the buffer, we run
-    the risk of the wait being interrupted and the domains prematurely
-    cleared. The next time we attempt to wait upon the buffer (after
-    userspace handles the signal), we believe that the buffer is idle and so
-    skip the wait.
-    
-    There are a number of bugs across all generations which show signs of an
-    overly haste reuse of active buffers.
-    
-    Such as:
-    
-      https://bugs.freedesktop.org/show_bug.cgi?id=29046
-      https://bugs.freedesktop.org/show_bug.cgi?id=35863
-      https://bugs.freedesktop.org/show_bug.cgi?id=38952
-      https://bugs.freedesktop.org/show_bug.cgi?id=40282
-      https://bugs.freedesktop.org/show_bug.cgi?id=41098
-      https://bugs.freedesktop.org/show_bug.cgi?id=41102
-      https://bugs.freedesktop.org/show_bug.cgi?id=41284
-      https://bugs.freedesktop.org/show_bug.cgi?id=42141
-    
-    A couple of those pre-date i915_gem_object_finish_gpu(), so may be
-    unrelated (such as a wild write from a userspace command buffer), but
-    this does look like a convincing cause for most of those bugs.
-    
-    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
-    Cc: stable at kernel.org
-    Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>
-    Reviewed-by: Eugeni Dodonov <eugeni.dodonov at intel.com>
-
-diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
-index d560175..036bc58 100644
---- a/drivers/gpu/drm/i915/i915_gem.c
-+++ b/drivers/gpu/drm/i915/i915_gem.c
-@@ -3087,10 +3087,13 @@ i915_gem_object_finish_gpu(struct drm_i915_gem_object *obj)
- 			return ret;
- 	}
- 
-+	ret = i915_gem_object_wait_rendering(obj);
-+	if (ret)
-+		return ret;
-+
- 	/* Ensure that we invalidate the GPU's caches and TLBs. */
- 	obj->base.read_domains &= ~I915_GEM_GPU_DOMAINS;
--
--	return i915_gem_object_wait_rendering(obj);
-+	return 0;
- }
- 
- /**

Modified: linux.install
===================================================================
--- linux.install	2012-04-06 10:09:10 UTC (rev 155771)
+++ linux.install	2012-04-06 10:38:30 UTC (rev 155772)
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.2.13-1-ARCH
+KERNEL_VERSION=3.2.14-1-ARCH
 
 post_install () {
   # updating module dependencies