diff options
| author | David S. Miller | 2012-02-04 22:39:32 +0100 |
|---|---|---|
| committer | David S. Miller | 2012-02-04 22:39:32 +0100 |
| commit | dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb (patch) | |
| tree | f16ace0ae09edab16bf6d0be9e8280dfbb7100da /drivers/gpu/drm/nouveau/nouveau_bo.c | |
| parent | mlx4: Fix typo in cmd.c (diff) | |
| parent | netprio_cgroup: Fix obo in get_prioidx (diff) | |
| download | kernel-qcow2-linux-dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb.tar.gz kernel-qcow2-linux-dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb.tar.xz kernel-qcow2-linux-dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_bo.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bo.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 724b41a2b9e9..ec54364ac828 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -812,6 +812,10 @@ nouveau_bo_move_ntfy(struct ttm_buffer_object *bo, struct ttm_mem_reg *new_mem) struct nouveau_bo *nvbo = nouveau_bo(bo); struct nouveau_vma *vma; + /* ttm can now (stupidly) pass the driver bos it didn't create... */ + if (bo->destroy != nouveau_bo_del_ttm) + return; + list_for_each_entry(vma, &nvbo->vma_list, head) { if (new_mem && new_mem->mem_type == TTM_PL_VRAM) { nouveau_vm_map(vma, new_mem->mm_node); |