drm/nouveau: if requested, try harder at disabling sysmem pushbufs

On >=nv50, userspace would still end up allocating pushbufs in GART.

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

1 files changed, 10 insertions, 6 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c
index b0d753f45bbd..a319d5646ea9 100644
--- a/drivers/gpu/drm/nouveau/nouveau_channel.c
+++ b/drivers/gpu/drm/nouveau/nouveau_channel.c
@@ -411,13 +411,17 @@ nouveau_ioctl_fifo_alloc(struct drm_device *dev, void *data,
                 return ret;
         init->channel  = chan->id;
 
-        if (chan->dma.ib_max)
-                init->pushbuf_domains = NOUVEAU_GEM_DOMAIN_VRAM |
-                                        NOUVEAU_GEM_DOMAIN_GART;
-        else if (chan->pushbuf_bo->bo.mem.mem_type == TTM_PL_VRAM)
+        if (nouveau_vram_pushbuf == 0) {
+                if (chan->dma.ib_max)
+                        init->pushbuf_domains = NOUVEAU_GEM_DOMAIN_VRAM |
+                                                NOUVEAU_GEM_DOMAIN_GART;
+                else if (chan->pushbuf_bo->bo.mem.mem_type == TTM_PL_VRAM)
+                        init->pushbuf_domains = NOUVEAU_GEM_DOMAIN_VRAM;
+                else
+                        init->pushbuf_domains = NOUVEAU_GEM_DOMAIN_GART;
+        } else {
                 init->pushbuf_domains = NOUVEAU_GEM_DOMAIN_VRAM;
-        else
-                init->pushbuf_domains = NOUVEAU_GEM_DOMAIN_GART;
+        }
 
         if (dev_priv->card_type < NV_C0) {
                 init->subchan[0].handle = NvM2MF;