dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

drm/nouveau: fix pinning of notifier block

Browse source 
Problem introduced with commit 6ba9a68317

Reported-by: Bob Gleitsmann <rjgleits@bellsouth.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2011-04-18 09:12:25 +10:00
parent 8706398bf8
commit 11dea1a214
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/gpu/drm/nouveau/nouveau_notifier.c
View file

@ -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;