diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-11-06 14:34:31 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-11-10 10:26:09 +1000 |
| commit | ad507042914aafdda2771c0e698ed82fec313bfd (patch) | |
| tree | bcf826400a27645be8a277b38dd3195194aae8ed | |
| parent | 6802845158b20d0aac9f7a092356aa70eb49e7b6 (diff) | |
| download | nouveau-ad507042914aafdda2771c0e698ed82fec313bfd.tar.gz | |
drm: fix pin refcnt leak in failure path
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drm/nouveau_bo.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drm/nouveau_bo.c b/drm/nouveau_bo.c index d2a4768e3..d409b2660 100644 --- a/drm/nouveau_bo.c +++ b/drm/nouveau_bo.c @@ -333,22 +333,22 @@ nouveau_bo_pin(struct nouveau_bo *nvbo, uint32_t memtype) nouveau_bo_placement_set(nvbo, memtype, 0); ret = nouveau_bo_validate(nvbo, false, false); - if (ret == 0) { - switch (bo->mem.mem_type) { - case TTM_PL_VRAM: - drm->gem.vram_available -= bo->mem.size; - break; - case TTM_PL_TT: - drm->gem.gart_available -= bo->mem.size; - break; - default: - break; - } + if (ret) + goto out; + + switch (bo->mem.mem_type) { + case TTM_PL_VRAM: + drm->gem.vram_available -= bo->mem.size; + break; + case TTM_PL_TT: + drm->gem.gart_available -= bo->mem.size; + break; + default: + break; } ref_inc: nvbo->pin_refcnt++; - out: ttm_bo_unreserve(bo); return ret; |