diff options
| author | Maarten Lankhorst | 2013-07-07 10:37:35 +0200 |
|---|---|---|
| committer | Ben Skeggs | 2013-07-10 02:47:49 +0200 |
| commit | 4f3855997c5d2bf6443853800eb1a03f61ad9140 (patch) | |
| tree | 49eb36131fa92c38d3a622914c5ee690306ca59a /drivers/gpu/drm/nouveau/nouveau_bo.c | |
| parent | drm/nv50/kms: fix pin refcnt leaks (diff) | |
| download | kernel-qcow2-linux-4f3855997c5d2bf6443853800eb1a03f61ad9140.tar.gz kernel-qcow2-linux-4f3855997c5d2bf6443853800eb1a03f61ad9140.tar.xz kernel-qcow2-linux-4f3855997c5d2bf6443853800eb1a03f61ad9140.zip | |
drm/nouveau: do not unpin in nouveau_gem_object_del
This should no longer be required, and is harmful for framebuffer pinning.
Also add a warning if unpin causes the pin count to drop below 0.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_bo.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bo.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 85fed108d7e4..824a98811de6 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -148,6 +148,7 @@ nouveau_bo_del_ttm(struct ttm_buffer_object *bo) if (unlikely(nvbo->gem)) DRM_ERROR("bo %p still attached to GEM object\n", bo); + WARN_ON(nvbo->pin_refcnt > 0); nv10_bo_put_tile_region(dev, nvbo->tile, NULL); kfree(nvbo); } @@ -340,13 +341,15 @@ nouveau_bo_unpin(struct nouveau_bo *nvbo) { struct nouveau_drm *drm = nouveau_bdev(nvbo->bo.bdev); struct ttm_buffer_object *bo = &nvbo->bo; - int ret; + int ret, ref; ret = ttm_bo_reserve(bo, false, false, false, 0); if (ret) return ret; - if (--nvbo->pin_refcnt) + ref = --nvbo->pin_refcnt; + WARN_ON_ONCE(ref < 0); + if (ref) goto out; nouveau_bo_placement_set(nvbo, bo->mem.placement, 0); |