drm/nv50-nvc0: explicitly map notifier bo into channel vm

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

diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index 23be8cb8ff5489c5e335842c2ff5126fecce46af..78d6899a8388172e5128f172ec773da88236f861 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -249,6 +249,7 @@ struct nouveau_channel {
 
        /* Notifier memory */
        struct nouveau_bo *notifier_bo;
+       struct nouveau_vma notifier_vma;
        struct drm_mm notifier_heap;
 
        /* PFIFO context */

diff --git a/drivers/gpu/drm/nouveau/nouveau_notifier.c b/drivers/gpu/drm/nouveau/nouveau_notifier.c
index 81b54e0bb822192d6de43b47bfaed8b0741fe095..6abdbe6530a7b31254879ebed445b23cb2b1636c 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_notifier.c
+++ b/drivers/gpu/drm/nouveau/nouveau_notifier.c
@@ -34,6 +34,7 @@ int
 nouveau_notifier_init_channel(struct nouveau_channel *chan)
 {
        struct drm_device *dev = chan->dev;
+       struct drm_nouveau_private *dev_priv = dev->dev_private;
        struct nouveau_bo *ntfy = NULL;
        uint32_t flags, ttmpl;
        int ret;
@@ -58,14 +59,22 @@ nouveau_notifier_init_channel(struct nouveau_channel *chan)
        if (ret)
                goto out_err;
 
+       if (dev_priv->card_type >= NV_50) {
+               ret = nouveau_bo_vma_add(ntfy, chan->vm, &chan->notifier_vma);
+               if (ret)
+                       goto out_err;
+       }
+
        ret = drm_mm_init(&chan->notifier_heap, 0, ntfy->bo.mem.size);
        if (ret)
                goto out_err;
 
        chan->notifier_bo = ntfy;
 out_err:
-       if (ret)
+       if (ret) {
+               nouveau_bo_vma_del(ntfy, &chan->notifier_vma);
                drm_gem_object_unreference_unlocked(ntfy->gem);
+       }
 
        return ret;
 }
@@ -78,6 +87,7 @@ nouveau_notifier_takedown_channel(struct nouveau_channel *chan)
        if (!chan->notifier_bo)
                return;
 
+       nouveau_bo_vma_del(chan->notifier_bo, &chan->notifier_vma);
        nouveau_bo_unmap(chan->notifier_bo);
        mutex_lock(&dev->struct_mutex);
        nouveau_bo_unpin(chan->notifier_bo);
@@ -125,7 +135,7 @@ nouveau_notifier_alloc(struct nouveau_channel *chan, uint32_t handle,
                offset  = chan->notifier_bo->bo.offset;
        } else {
                target = NV_MEM_TARGET_VM;
-               offset = chan->notifier_bo->vma.offset;
+               offset = chan->notifier_vma.offset;
        }
        offset += mem->start;
 

diff --git a/drivers/gpu/drm/nouveau/nvc0_fbcon.c b/drivers/gpu/drm/nouveau/nvc0_fbcon.c
index 5e64a9bcd31817e8eb0feb9b963f2dc387edbec8..a495e48197caa0d522e6e99efb30eafc03c8570a 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvc0_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nvc0_fbcon.c
@@ -203,8 +203,8 @@ nvc0_fbcon_accel_init(struct fb_info *info)
        BEGIN_NVC0(chan, 2, NvSub2D, 0x0000, 1);
        OUT_RING  (chan, 0x0000902d);
        BEGIN_NVC0(chan, 2, NvSub2D, 0x0104, 2);
-       OUT_RING  (chan, upper_32_bits(chan->notifier_bo->vma.offset));
-       OUT_RING  (chan, lower_32_bits(chan->notifier_bo->vma.offset));
+       OUT_RING  (chan, upper_32_bits(chan->notifier_vma.offset));
+       OUT_RING  (chan, lower_32_bits(chan->notifier_vma.offset));
        BEGIN_NVC0(chan, 2, NvSub2D, 0x0290, 1);
        OUT_RING  (chan, 0);
        BEGIN_NVC0(chan, 2, NvSub2D, 0x0888, 1);