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>
This commit is contained in:
parent
fbba036a56
commit
8c06e60ed4
1 changed files with 10 additions and 6 deletions
|
@ -411,6 +411,7 @@ nouveau_ioctl_fifo_alloc(struct drm_device *dev, void *data,
|
||||||
return ret;
|
return ret;
|
||||||
init->channel = chan->id;
|
init->channel = chan->id;
|
||||||
|
|
||||||
|
if (nouveau_vram_pushbuf == 0) {
|
||||||
if (chan->dma.ib_max)
|
if (chan->dma.ib_max)
|
||||||
init->pushbuf_domains = NOUVEAU_GEM_DOMAIN_VRAM |
|
init->pushbuf_domains = NOUVEAU_GEM_DOMAIN_VRAM |
|
||||||
NOUVEAU_GEM_DOMAIN_GART;
|
NOUVEAU_GEM_DOMAIN_GART;
|
||||||
|
@ -418,6 +419,9 @@ nouveau_ioctl_fifo_alloc(struct drm_device *dev, void *data,
|
||||||
init->pushbuf_domains = NOUVEAU_GEM_DOMAIN_VRAM;
|
init->pushbuf_domains = NOUVEAU_GEM_DOMAIN_VRAM;
|
||||||
else
|
else
|
||||||
init->pushbuf_domains = NOUVEAU_GEM_DOMAIN_GART;
|
init->pushbuf_domains = NOUVEAU_GEM_DOMAIN_GART;
|
||||||
|
} else {
|
||||||
|
init->pushbuf_domains = NOUVEAU_GEM_DOMAIN_VRAM;
|
||||||
|
}
|
||||||
|
|
||||||
if (dev_priv->card_type < NV_C0) {
|
if (dev_priv->card_type < NV_C0) {
|
||||||
init->subchan[0].handle = NvM2MF;
|
init->subchan[0].handle = NvM2MF;
|
||||||
|
|
Loading…
Add table
Reference in a new issue