drm/nv50: enable use of per-client gpu address space

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

diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index 12b34710a76fb0427b1e692f8f69657972599c13..91cc2a64d8e0aab30d880986b82e13474de4d8e2 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -769,6 +769,7 @@ nouveau_open(struct drm_device *dev, struct drm_file *file_priv)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;
        struct nouveau_fpriv *fpriv;
+       int ret;
 
        fpriv = kzalloc(sizeof(*fpriv), GFP_KERNEL);
        if (unlikely(!fpriv))
@@ -777,8 +778,17 @@ nouveau_open(struct drm_device *dev, struct drm_file *file_priv)
        spin_lock_init(&fpriv->lock);
        INIT_LIST_HEAD(&fpriv->channels);
 
-       if (dev_priv->card_type >= NV_50)
+       if (dev_priv->card_type == NV_50) {
+               ret = nouveau_vm_new(dev, 0, (1ULL << 40), 0x0020000000ULL,
+                                    &fpriv->vm);
+               if (ret) {
+                       kfree(fpriv);
+                       return ret;
+               }
+       } else
+       if (dev_priv->card_type >= NV_C0) {
                nouveau_vm_ref(dev_priv->chan_vm, &fpriv->vm, NULL);
+       }
 
        file_priv->driver_priv = fpriv;
        return 0;