[gentoo-commits] linux-patches r1581 - genpatches-2.6/trunk/2.6.29

[Mike Pagano (mpagano)]

Author: mpagano
Date: 2009-07-03 00:47:12 +0000 (Fri, 03 Jul 2009)
New Revision: 1581

Added:
   genpatches-2.6/trunk/2.6.29/2705_i915-domain-set-when-faulting.patch
Modified:
   genpatches-2.6/trunk/2.6.29/0000_README
Log:
i915: Set object to gtt domain when faulting it back in

Modified: genpatches-2.6/trunk/2.6.29/0000_README
===================================================================
--- genpatches-2.6/trunk/2.6.29/0000_README	2009-07-02 02:03:38 UTC (rev 1580)
+++ genpatches-2.6/trunk/2.6.29/0000_README	2009-07-03 00:47:12 UTC (rev 1581)
@@ -83,6 +83,10 @@
 From:   http://bugs.gentoo.org/show_bug.cgi?id=251237
 Desc:   usblp: continuously poll for status
 
+Patch:  2705_i915-domain-set-when-faulting.patch
+From:   https://bugs.gentoo.org/show_bug.cgi?id=275549
+Desc:   i915: Set object to gtt domain when faulting it back in
+
 Patch:	2900_bluetooth-fix-sysfs.patch
 From:	http://bugs.gentoo.org/show_bug.cgi?id=274007
 Desc:	Fix hard lock with bluetooth connections

Added: genpatches-2.6/trunk/2.6.29/2705_i915-domain-set-when-faulting.patch
===================================================================
--- genpatches-2.6/trunk/2.6.29/2705_i915-domain-set-when-faulting.patch	                        (rev 0)
+++ genpatches-2.6/trunk/2.6.29/2705_i915-domain-set-when-faulting.patch	2009-07-03 00:47:12 UTC (rev 1581)
@@ -0,0 +1,16 @@
+--- a/drivers/gpu/drm/i915/i915_gem.c	2009-07-02 19:05:38.000000000 -0400
++++ b/drivers/gpu/drm/i915/i915_gem.c	2009-07-02 20:03:53.000000000 -0400
+@@ -577,6 +577,13 @@ int i915_gem_fault(struct vm_area_struct
+ 			mutex_unlock(&dev->struct_mutex);
+ 			return VM_FAULT_SIGBUS;
+ 		}
++
++		ret = i915_gem_object_set_to_gtt_domain(obj, write);
++		if (ret) {
++			mutex_unlock(&dev->struct_mutex);
++			return VM_FAULT_SIGBUS;
++		}
++
+ 		list_add(&obj_priv->list, &dev_priv->mm.inactive_list);
+ 	}
+