[intel-gem] Write the presumed_offset back out after updating it.

Otherwise, 965 constant state buffers get re-relocated every exec.  Ouch.

diff --git a/linux-core/i915_gem.c b/linux-core/i915_gem.c
index 1fc48e0c2f1623b70f345ab49844c2a6000de522..52a57d5e57650a59fe2036ea9c56deb71a449d78 100644 (file)
--- a/linux-core/i915_gem.c
+++ b/linux-core/i915_gem.c
@@ -1137,6 +1137,16 @@ i915_gem_reloc_and_validate_object(struct drm_gem_object *obj,
 #endif
                writel(reloc_val, reloc_entry);
 
+               /* Write the updated presumed offset for this entry back out
+                * to the user.
+                */
+               reloc.presumed_offset = target_obj_priv->gtt_offset;
+               ret = copy_to_user(relocs + i, &reloc, sizeof(reloc));
+               if (ret != 0) {
+                       drm_gem_object_unreference(target_obj);
+                       return ret;
+               }
+
                drm_gem_object_unreference(target_obj);
        }