[gentoo-commits] linux-patches r1868 - genpatches-2.6/trunk/2.6.36

[Mike Pagano (mpagano)]

Author: mpagano
Date: 2011-02-01 15:47:11 +0000 (Tue, 01 Feb 2011)
New Revision: 1868

Added:
   genpatches-2.6/trunk/2.6.36/2800_handle-ret-from-i915-gpu-idle.patch
Modified:
   genpatches-2.6/trunk/2.6.36/0000_README
Log:
Properly handle the return value from i915_wait_request call

Modified: genpatches-2.6/trunk/2.6.36/0000_README
===================================================================
--- genpatches-2.6/trunk/2.6.36/0000_README	2011-01-21 01:32:59 UTC (rev 1867)
+++ genpatches-2.6/trunk/2.6.36/0000_README	2011-02-01 15:47:11 UTC (rev 1868)
@@ -55,6 +55,10 @@
 From:   http://bugs.gentoo.org/show_bug.cgi?id=344153
 Desc:   AD codec fix for PCM stream assignments
 
+Patch:  2800_handle-ret-from-i915-gpu-idle.patch
+From:   http://bugs.gentoo.org/show_bug.cgi?id=346705
+Desc:   Properly handle the return value from i915_wait_request call
+
 Patch:  2900_xconfig-with-qt4.patch
 From:   http://bugs.gentoo.org/show_bug.cgi?id=342007
 Desc:   xconfig patch for qt4 - thanks to alexander stein

Added: genpatches-2.6/trunk/2.6.36/2800_handle-ret-from-i915-gpu-idle.patch
===================================================================
--- genpatches-2.6/trunk/2.6.36/2800_handle-ret-from-i915-gpu-idle.patch	                        (rev 0)
+++ genpatches-2.6/trunk/2.6.36/2800_handle-ret-from-i915-gpu-idle.patch	2011-02-01 15:47:11 UTC (rev 1868)
@@ -0,0 +1,11 @@
+--- a/drivers/gpu/drm/i915/i915_gem.c	2010-12-17 09:59:07.000000000 -0500
++++ b/drivers/gpu/drm/i915/i915_gem.c	2010-12-17 09:59:51.000000000 -0500
+@@ -2045,6 +2045,8 @@ i915_gpu_idle(struct drm_device *dev)
+ 	if (seqno1 == 0)
+ 		return -ENOMEM;
+ 	ret = i915_wait_request(dev, seqno1, &dev_priv->render_ring);
++	if (ret)
++		return ret;
+ 
+ 	if (HAS_BSD(dev)) {
+ 		seqno2 = i915_add_request(dev, NULL, I915_GEM_GPU_DOMAINS,