diff --git a/srcpkgs/kernel/patches/i915-gpu-finish.patch b/srcpkgs/kernel/patches/i915-gpu-finish.patch deleted file mode 100644 index 6f3459477bc..00000000000 --- a/srcpkgs/kernel/patches/i915-gpu-finish.patch +++ /dev/null @@ -1,55 +0,0 @@ -commit 389a55581e30607af0fcde6cdb4e54f189cf46cf -Author: Chris Wilson -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 - Cc: stable@kernel.org - Reviewed-by: Daniel Vetter - Reviewed-by: Eugeni Dodonov - -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; - } - - /** diff --git a/srcpkgs/kernel/template b/srcpkgs/kernel/template index 8fc8999a968..8b1a84b43b1 100644 --- a/srcpkgs/kernel/template +++ b/srcpkgs/kernel/template @@ -2,10 +2,10 @@ # pkgname=kernel _kmajorver=3.3 -version=${_kmajorver}.0 -wrksrc="linux-${_kmajorver}" -distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-${_kmajorver}.tar.xz" -checksum=355df2085626cdf0083c4bc0fe3017419034b6db5cce6f437ae8234a5e90b40c +version=${_kmajorver}.1 +wrksrc="linux-${version}" +distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-${version}.tar.xz" +checksum=186cff7923812dd0c71416dcf75a5fac792c47dcbaffda615ad1a2539e8c492c maintainer="Juan RP " homepage="http://www.kernel.org" license="GPL-2"