diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-04-18 09:12:25 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-04-20 08:51:23 +1000 |
| commit | 11dea1a2144f24216551fbeddacbde0980ae8a55 (patch) | |
| tree | d5fe0e21af89f8698d8e14a43db6cb4fde4ab04a /drivers/gpu | |
| parent | 8706398bf8841868d4e56fc924a5edcd3f156243 (diff) | |
| download | linux-3.10-11dea1a2144f24216551fbeddacbde0980ae8a55.tar.gz linux-3.10-11dea1a2144f24216551fbeddacbde0980ae8a55.tar.bz2 linux-3.10-11dea1a2144f24216551fbeddacbde0980ae8a55.zip | |
drm/nouveau: fix pinning of notifier block
Problem introduced with commit 6ba9a68317781537d6184d3fdb2d0f20c97da3a4
Reported-by: Bob Gleitsmann <rjgleits@bellsouth.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_notifier.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_notifier.c b/drivers/gpu/drm/nouveau/nouveau_notifier.c index 7ba3fc0b30c..5b39718ae1f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_notifier.c +++ b/drivers/gpu/drm/nouveau/nouveau_notifier.c @@ -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; |