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

[Mike Pagano (mpagano)]

Author: mpagano
Date: 2010-12-01 01:09:15 +0000 (Wed, 01 Dec 2010)
New Revision: 1834

Added:
   genpatches-2.6/trunk/2.6.36/2800_ttm-bo-init-retry-after-failure.patch
Modified:
   genpatches-2.6/trunk/2.6.36/0000_README
Log:
Fix retrying ttm_bo_init() after it failed once

Modified: genpatches-2.6/trunk/2.6.36/0000_README
===================================================================
--- genpatches-2.6/trunk/2.6.36/0000_README	2010-11-22 23:52:07 UTC (rev 1833)
+++ genpatches-2.6/trunk/2.6.36/0000_README	2010-12-01 01:09:15 UTC (rev 1834)
@@ -47,6 +47,10 @@
 From:   http://bugs.gentoo.org/show_bug.cgi?id=344153
 Desc:   AD codec fix for PCM stream assignments
 
+Patch:  2800_ttm-bo-init-retry-after-failure.patch
+From:   http://tinyurl.com/39fzx9t
+Desc:   radeon: Fix retrying ttm_bo_init() after it failed once
+
 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_ttm-bo-init-retry-after-failure.patch
===================================================================
--- genpatches-2.6/trunk/2.6.36/2800_ttm-bo-init-retry-after-failure.patch	                        (rev 0)
+++ genpatches-2.6/trunk/2.6.36/2800_ttm-bo-init-retry-after-failure.patch	2010-12-01 01:09:15 UTC (rev 1834)
@@ -0,0 +1,20 @@
+--- a/drivers/gpu/drm/radeon/radeon_object.c	2010-11-30 19:36:43.003461127 -0500
++++ b/drivers/gpu/drm/radeon/radeon_object.c	2010-11-30 19:44:48.197516895 -0500
+@@ -102,6 +102,8 @@ int radeon_bo_create(struct radeon_devic
+ 		type = ttm_bo_type_device;
+ 	}
+ 	*bo_ptr = NULL;
++ 
++retry:
+ 	bo = kzalloc(sizeof(struct radeon_bo), GFP_KERNEL);
+ 	if (bo == NULL)
+ 		return -ENOMEM;
+@@ -109,8 +111,6 @@ int radeon_bo_create(struct radeon_devic
+ 	bo->gobj = gobj;
+ 	bo->surface_reg = -1;
+ 	INIT_LIST_HEAD(&bo->list);
+-
+-retry:
+ 	radeon_ttm_placement_from_domain(bo, domain);
+ 	/* Kernel allocation are uninterruptible */
+ 	mutex_lock(&rdev->vram_mutex);