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

Commit 11dea1a2 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: fix pinning of notifier block 



Problem introduced with commit 6ba9a683

Reported-by: default avatarBob Gleitsmann <rjgleits@bellsouth.net>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 8706398b

drivers/gpu/drm/nouveau/nouveau_notifier.c

+7 −4
Original line number Diff line number Diff line
@@ -35,19 +35,22 @@ nouveau_notifier_init_channel(struct nouveau_channel *chan) 
{

	struct drm_device *dev = chan->dev;

	struct nouveau_bo *ntfy = NULL;

	uint32_t flags;

	uint32_t flags, ttmpl;

	int ret;



	if (nouveau_vram_notify)

	if (nouveau_vram_notify) {

		flags = NOUVEAU_GEM_DOMAIN_VRAM;

	else

		ttmpl = TTM_PL_FLAG_VRAM;

	} else {

		flags = NOUVEAU_GEM_DOMAIN_GART;

		ttmpl = TTM_PL_FLAG_TT;

	}



	ret = nouveau_gem_new(dev, NULL, PAGE_SIZE, 0, flags, 0, 0, &ntfy);

	if (ret)

		return ret;



	ret = nouveau_bo_pin(ntfy, flags);

	ret = nouveau_bo_pin(ntfy, ttmpl);

	if (ret)

		goto out_err;