From: Imre Deak <imre.deak@intel.com>
Date: Tue, 26 Mar 2013 13:14:19 +0000 (+0200)
Subject: Revert "drm/i915: set dummy page for stolen objects"
X-Git-Tag: v3.10-rc1~110^2~51^2~50
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ed23abdd648358e69c1a94e0c70e45f6a23a7aab;p=users%2Fjedix%2Flinux-maple.git

Revert "drm/i915: set dummy page for stolen objects"

Since for_each_sg_page supports already memory w/o backing pages we can
revert the corresponding workaround.

This reverts commit 5bd4687e57bbacec20930f580d025aee9fa1f4d8.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
index 4aa6d73e6262..130d1db27e28 100644
--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
@@ -222,8 +222,8 @@ i915_pages_create_for_stolen(struct drm_device *dev,
 	}
 
 	sg = st->sgl;
-	/* we set the dummy page here only to make for_each_sg_page work */
-	sg_set_page(sg, dev_priv->gtt.scratch_page, size, offset);
+	sg->offset = offset;
+	sg->length = size;
 
 	sg_dma_address(sg) = (dma_addr_t)dev_priv->mm.stolen_base + offset;
 	sg_dma_len(sg) = size;