Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c06e60e authored by Ben Skeggs's avatar Ben Skeggs
Browse files

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



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

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent fbba036a

drivers/gpu/drm/nouveau/nouveau_channel.c

+10 −6
Original line number Diff line number Diff line
@@ -411,6 +411,7 @@ nouveau_ioctl_fifo_alloc(struct drm_device *dev, void *data, 
		return ret;

	init->channel  = chan->id;



	if (nouveau_vram_pushbuf == 0) {

		if (chan->dma.ib_max)

			init->pushbuf_domains = NOUVEAU_GEM_DOMAIN_VRAM |

						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;

		else

			init->pushbuf_domains = NOUVEAU_GEM_DOMAIN_GART;

	} else {

		init->pushbuf_domains = NOUVEAU_GEM_DOMAIN_VRAM;

	}



	if (dev_priv->card_type < NV_C0) {

		init->subchan[0].handle = NvM2MF;