Skip to content

Commit

Permalink
drm/nouveau: fix pinning of notifier block
Browse files Browse the repository at this point in the history
Problem introduced with commit 6ba9a68

Reported-by: Bob Gleitsmann <rjgleits@bellsouth.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
  • Loading branch information
Ben Skeggs committed Apr 19, 2011
1 parent 8706398 commit 11dea1a
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions drivers/gpu/drm/nouveau/nouveau_notifier.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 11dea1a

Please sign in to comment.