diff --git a/drm-i915-Use-cpu-relocations-if-the-object-is-in-the.patch b/drm-i915-Use-cpu-relocations-if-the-object-is-in-the.patch
new file mode 100644
index 000000000..0e282bf04
--- /dev/null
+++ b/drm-i915-Use-cpu-relocations-if-the-object-is-in-the.patch
@@ -0,0 +1,33 @@
+From 504c7267a1e84b157cbd7e9c1b805e1bc0c2c846 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu, 23 Aug 2012 13:12:52 +0100
+Subject: [PATCH] drm/i915: Use cpu relocations if the object is in the GTT
+ but not mappable
+
+This prevents the case of unbinding the object in order to process the
+relocations through the GTT and then rebinding it only to then proceed
+to use cpu relocations as the object is now in the CPU write domain. By
+choosing to use cpu relocations up front, we can therefore avoid the
+rebind penalty.
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+---
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+index f7346d8..dc87563 100644
+--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
++++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+@@ -95,6 +95,7 @@ eb_destroy(struct eb_objects *eb)
+ static inline int use_cpu_reloc(struct drm_i915_gem_object *obj)
+ {
+ 	return (obj->base.write_domain == I915_GEM_DOMAIN_CPU ||
++		!obj->map_and_fenceable ||
+ 		obj->cache_level != I915_CACHE_NONE);
+ }
+ 
+-- 
+1.7.12.1
+
diff --git a/kernel.spec b/kernel.spec
index f2b987ef2..8aec26692 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 1
+%global baserelease 2
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -747,6 +747,8 @@ Patch22070: net-tcp-bz857324.patch
 #rhbz 770484
 Patch22071: iwlwifi-fix-6000-ch-switch.patch
 
+Patch22072: linux-3.6-arm-build-fixup.patch
+
 #rhbz 862168
 Patch22073: mac80211_local_deauth_v3.6.patch
 
@@ -762,7 +764,8 @@ Patch22076: fix-stack-memory-content-leak-via-UNAME26.patch
 #rhbz 867344
 Patch22077: dont-call-cifs_lookup-on-hashed-negative-dentry.patch
 
-Patch22072: linux-3.6-arm-build-fixup.patch
+#rhbz 852210
+Patch22078: drm-i915-Use-cpu-relocations-if-the-object-is-in-the.patch
 
 # END OF PATCH DEFINITIONS
 
@@ -1477,6 +1480,9 @@ ApplyPatch fix-stack-memory-content-leak-via-UNAME26.patch
 #rhbz 867344
 ApplyPatch dont-call-cifs_lookup-on-hashed-negative-dentry.patch
 
+#rhbz 852210
+ApplyPatch drm-i915-Use-cpu-relocations-if-the-object-is-in-the.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2340,6 +2346,9 @@ fi
 #    '-'      |  |
 #              '-'
 %changelog
+* Wed Oct 24 2012 Josh Boyer <jwboyer@redhat.com>
+- Add patch to fix corrupted text with i915 (rhbz 852210)
+
 * Mon Oct 22 2012 Peter Robinson <pbrobinson@fedoraproject.org>
 - VIFO fails on ARM at the moment so disable it for the time being