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

drm/nouveau: fix pinning of notifier block

Problem introduced with commit 6ba9a683Reported-by: default avatarBob Gleitsmann <rjgleits@bellsouth.net>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 8706398b
...@@ -35,19 +35,22 @@ nouveau_notifier_init_channel(struct nouveau_channel *chan) ...@@ -35,19 +35,22 @@ nouveau_notifier_init_channel(struct nouveau_channel *chan)
{ {
struct drm_device *dev = chan->dev; struct drm_device *dev = chan->dev;
struct nouveau_bo *ntfy = NULL; struct nouveau_bo *ntfy = NULL;
uint32_t flags; uint32_t flags, ttmpl;
int ret; int ret;
if (nouveau_vram_notify) if (nouveau_vram_notify) {
flags = NOUVEAU_GEM_DOMAIN_VRAM; flags = NOUVEAU_GEM_DOMAIN_VRAM;
else ttmpl = TTM_PL_FLAG_VRAM;
} else {
flags = NOUVEAU_GEM_DOMAIN_GART; flags = NOUVEAU_GEM_DOMAIN_GART;
ttmpl = TTM_PL_FLAG_TT;
}
ret = nouveau_gem_new(dev, NULL, PAGE_SIZE, 0, flags, 0, 0, &ntfy); ret = nouveau_gem_new(dev, NULL, PAGE_SIZE, 0, flags, 0, 0, &ntfy);
if (ret) if (ret)
return ret; return ret;
ret = nouveau_bo_pin(ntfy, flags); ret = nouveau_bo_pin(ntfy, ttmpl);
if (ret) if (ret)
goto out_err; goto out_err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment