diff options
| author | Imre Deak <imre.deak@intel.com> | 2013-03-26 15:14:19 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-03-27 17:13:44 +0100 |
| commit | ed23abdd648358e69c1a94e0c70e45f6a23a7aab (patch) | |
| tree | 7024c762ce9322930bf2c9bc7fbaf7fb5a184dcc /drivers/gpu/drm/i915/i915_gem_stolen.c | |
| parent | 2db76d7c3c6db93058f983c8240f7c7c25e87ee6 (diff) | |
| download | talos-obmc-linux-ed23abdd648358e69c1a94e0c70e45f6a23a7aab.tar.gz talos-obmc-linux-ed23abdd648358e69c1a94e0c70e45f6a23a7aab.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_stolen.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_stolen.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |
