1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index af7cfb82571..0c9399bb9bf 100644
--- 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);