drm/nv50-nvc0: delay GART binding until move_notify time

The immediate benefit of doing this is that on NV50 and up, the GPU
virtual address of any buffer is now constant, regardless of what
memtype they're placed in.

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

1 files changed, 11 insertions, 5 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_notifier.c b/drivers/gpu/drm/nouveau/nouveau_notifier.c
index dc8349a3317a..a86f27655fc4 100644
--- a/drivers/gpu/drm/nouveau/nouveau_notifier.c
+++ b/drivers/gpu/drm/nouveau/nouveau_notifier.c
@@ -98,6 +98,7 @@ nouveau_notifier_alloc(struct nouveau_channel *chan, uint32_t handle,
                        int size, uint32_t *b_offset)
 {
         struct drm_device *dev = chan->dev;
+        struct drm_nouveau_private *dev_priv = dev->dev_private;
         struct nouveau_gpuobj *nobj = NULL;
         struct drm_mm_node *mem;
         uint32_t offset;
@@ -111,11 +112,16 @@ nouveau_notifier_alloc(struct nouveau_channel *chan, uint32_t handle,
                 return -ENOMEM;
         }
 
-        if (chan->notifier_bo->bo.mem.mem_type == TTM_PL_VRAM)
-                target = NV_MEM_TARGET_VRAM;
-        else
-                target = NV_MEM_TARGET_GART;
-        offset  = chan->notifier_bo->bo.mem.start << PAGE_SHIFT;
+        if (dev_priv->card_type < NV_50) {
+                if (chan->notifier_bo->bo.mem.mem_type == TTM_PL_VRAM)
+                        target = NV_MEM_TARGET_VRAM;
+                else
+                        target = NV_MEM_TARGET_GART;
+                offset  = chan->notifier_bo->bo.mem.start << PAGE_SHIFT;
+        } else {
+                target = NV_MEM_TARGET_VM;
+                offset = chan->notifier_bo->vma.offset;
+        }
         offset += mem->start;
 
         ret = nouveau_gpuobj_dma_new(chan, NV_CLASS_DMA_IN_MEMORY, offset,