summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_dma.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2012-04-26 23:28:16 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-05-03 11:18:31 +0200
commit4225d0f219d22440e33a5686bf806356cb25bcf5 (patch)
treeaa0447ef7f0a739000da6bdb241de42a70ae9205 /drivers/gpu/drm/i915/i915_dma.c
parent316d388450be37fedcf4b37cf211b2bdc7826bb8 (diff)
downloadlinux-4225d0f219d22440e33a5686bf806356cb25bcf5.tar.gz
linux-4225d0f219d22440e33a5686bf806356cb25bcf5.tar.bz2
linux-4225d0f219d22440e33a5686bf806356cb25bcf5.zip
drm/i915: fixup __iomem mixups in ringbuffer.c
Two things: - ring->virtual start is an __iomem pointer, treat it accordingly. - dev_priv->status_page.page_addr is now always a cpu addr, no pointer casting needed for that. Take the opportunity to remove the unnecessary drm indirection when setting up the ringbuffer iomapping. v2: Add a compiler barrier before reading the hw status page. Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
-rw-r--r--drivers/gpu/drm/i915/i915_dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index f0c0a7ed90e5..b5a1a72d3325 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -256,7 +256,7 @@ static int i915_dma_resume(struct drm_device * dev)
DRM_DEBUG_DRIVER("%s\n", __func__);
- if (ring->map.handle == NULL) {
+ if (ring->virtual_start == NULL) {
DRM_ERROR("can not ioremap virtual address for"
" ring buffer\n");
return -ENOMEM;