From 76c094d5d6f3c7ede86ab79a598a43b66df94e55 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat, 30 Oct 2010 22:52:31 +0100
Subject: [PATCH] --- yaml --- r: 228677 b: refs/heads/master c:
 ff75b9bc489710ff223bc0d805bf3b862dc347ea h: refs/heads/master i:   228675:
 69d3d14320107c9c1858e45df3dcf35ff4426489 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_gem.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 537290455894..b2359b6f506e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: add354ddf62beac55ca3ba64835dd703a0649867
+refs/heads/master: ff75b9bc489710ff223bc0d805bf3b862dc347ea
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
index 936ddd83f8a2..e3fc333e2e57 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -4925,7 +4925,7 @@ i915_gem_attach_phys_object(struct drm_device *dev,
 		if (IS_ERR(page))
 			return PTR_ERR(page);
 
-		src = kmap_atomic(obj_priv->pages[i]);
+		src = kmap_atomic(page);
 		dst = obj_priv->phys_obj->handle->vaddr + (i * PAGE_SIZE);
 		memcpy(dst, src, PAGE_SIZE);
 		kunmap_atomic(src);