---

yaml --- r: 334711 b: refs/heads/master c: 74ce6b6 h: refs/heads/master i: 334709: b7dc755 334707: 0239aa1 334703: 95f7cdb v: v3
git-mirror · Oct 19, 2012 · c1c001c · c1c001c
1 parent 8e29814
commit c1c001c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c31407a3672aaebb4acddf90944a114fa5c8af7b
+refs/heads/master: 74ce6b6c63262defba91c4d790b3f91074793c0d
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -1825,10 +1825,11 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj)
 		sg_set_page(sg, page, PAGE_SIZE, 0);
 	}
 
+	obj->pages = st;
+
 	if (i915_gem_object_needs_bit17_swizzle(obj))
 		i915_gem_object_do_bit_17_swizzle(obj);
 
-	obj->pages = st;
 	return 0;
 
 err_pages: