diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-02-28 15:35:16 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-02-28 15:35:16 +1000 |
| commit | 467a29ea5ad1c1e3b1ffd6aab1166331fcd39361 (patch) | |
| tree | 596eff2f23ed4a40ea83083b0ac1811a93c1f649 | |
| parent | 1922756124ddd53846877416d92ba4a802bc658f (diff) | |
| parent | 7db26623257a16c901a4b77bfc5096ee05304932 (diff) | |
| download | blackbird-op-linux-467a29ea5ad1c1e3b1ffd6aab1166331fcd39361.tar.gz blackbird-op-linux-467a29ea5ad1c1e3b1ffd6aab1166331fcd39361.zip | |
Merge remote branch 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next into drm-fixes
* 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next:
drm/nv50-nvc0: make sure vma is definitely unmapped when destroying bo
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bo.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index d38a4d9f9b0b..a52184007f5f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -49,7 +49,10 @@ nouveau_bo_del_ttm(struct ttm_buffer_object *bo) DRM_ERROR("bo %p still attached to GEM object\n", bo); nv10_mem_put_tile_region(dev, nvbo->tile, NULL); - nouveau_vm_put(&nvbo->vma); + if (nvbo->vma.node) { + nouveau_vm_unmap(&nvbo->vma); + nouveau_vm_put(&nvbo->vma); + } kfree(nvbo); } |
