Revert "drm/i915: set dummy page for stolen objects"
authorImre Deak <imre.deak@intel.com>
Tue, 26 Mar 2013 13:14:19 +0000 (15:14 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 27 Mar 2013 16:13:44 +0000 (17:13 +0100)
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>
drivers/gpu/drm/i915/i915_gem_stolen.c

index 4aa6d73e6262f91025db44817eea4607e45d3f0f..130d1db27e288d0479804696d33e1014e1581a18 100644 (file)
@@ -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;