aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_ringbuffer.c
diff options
context:
space:
mode:
authorBen Widawsky <ben@bwidawsk.net>2013-01-17 15:45:16 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-01-17 16:47:03 -0500
commitdabb7a91ae6442d642a52e0de22d781a8ad2af12 (patch)
tree6c982e12e29c06cbfa2c5290832f258f454c36cf /drivers/gpu/drm/i915/intel_ringbuffer.c
parent5d4545aef561ad47f91bcf75814af20c104b5a9e (diff)
drm/i915: Remove use on gma_bus_addr on gen6+
We have enough info to not use the intel_gtt bridge stuff. v2: Move setup of mappable_base above the legacy init stuff because we still need that on older platforms. (Daniel) v3: Remove the dev_priv hunk which was rebased in by accident Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> (v2) Signed-off-by: Ben Widawsky <ben@bwidawsk.net> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
-rw-r--r--drivers/gpu/drm/i915/intel_ringbuffer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 59e02691baf3..ce1d07487402 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -1203,7 +1203,7 @@ static int intel_init_ring_buffer(struct drm_device *dev,
1203 goto err_unpin; 1203 goto err_unpin;
1204 1204
1205 ring->virtual_start = 1205 ring->virtual_start =
1206 ioremap_wc(dev_priv->mm.gtt->gma_bus_addr + obj->gtt_offset, 1206 ioremap_wc(dev_priv->gtt.mappable_base + obj->gtt_offset,
1207 ring->size); 1207 ring->size);
1208 if (ring->virtual_start == NULL) { 1208 if (ring->virtual_start == NULL) {
1209 DRM_ERROR("Failed to map ringbuffer.\n"); 1209 DRM_ERROR("Failed to map ringbuffer.\n");