drm/nouveau/gem: use bo.offset rather than mm_node.start

Won't necessarily be a drm_mm_node in the future, and I can't think of any
good reason to not use the offset from the bo struct.  There may have been
some reason once apon a time, but, separate commit just in case.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index af7cfb825716b4f83911221fdc068a6c74a13d27..0c9399bb9bf632ba5726aa546263382549c31c25 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -733,10 +733,8 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
                for (i = 0; i < req->nr_push; i++) {
                        struct nouveau_bo *nvbo = (void *)(unsigned long)
                                bo[push[i].bo_index].user_priv;
-                       struct drm_mm_node *mem = nvbo->bo.mem.mm_node;
 
-                       OUT_RING(chan, ((mem->start << PAGE_SHIFT) +
-                                       push[i].offset) | 2);
+                       OUT_RING(chan, (nvbo->bo.offset + push[i].offset) | 2);
                        OUT_RING(chan, 0);
                }
        } else {
@@ -749,7 +747,6 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
                for (i = 0; i < req->nr_push; i++) {
                        struct nouveau_bo *nvbo = (void *)(unsigned long)
                                bo[push[i].bo_index].user_priv;
-                       struct drm_mm_node *mem = nvbo->bo.mem.mm_node;
                        uint32_t cmd;
 
                        cmd = chan->pushbuf_base + ((chan->dma.cur + 2) << 2);
@@ -771,8 +768,8 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
                                                push[i].length - 8) / 4, cmd);
                        }
 
-                       OUT_RING(chan, ((mem->start << PAGE_SHIFT) +
-                                       push[i].offset) | 0x20000000);
+                       OUT_RING(chan, 0x20000000 |
+                                     (nvbo->bo.offset + push[i].offset));
                        OUT_RING(chan, 0);
                        for (j = 0; j < NOUVEAU_DMA_SKIPS; j++)
                                OUT_RING(chan, 0);