openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/nouveau: we need pin_refcnt for nouveau_bo_placement_set() 

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2014-11-10 11:12:17 +10:00
parent 2b1930c3f3
commit 50ab2e5206
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/nouveau/nouveau_bo.c
View File

@ -318,7 +318,7 @@ nouveau_bo_pin(struct nouveau_bo *nvbo, uint32_t memtype)
ret = ttm_bo_reserve(bo, false, false, false, NULL); ret = ttm_bo_reserve(bo, false, false, false, NULL);
if (ret) if (ret)
goto out; return ret;
if (nvbo->pin_refcnt && !(memtype & (1 << bo->mem.mem_type))) { if (nvbo->pin_refcnt && !(memtype & (1 << bo->mem.mem_type))) {
NV_ERROR(drm, "bo %p pinned elsewhere: 0x%08x vs 0x%08x\n", bo, NV_ERROR(drm, "bo %p pinned elsewhere: 0x%08x vs 0x%08x\n", bo,
@ -327,14 +327,20 @@ nouveau_bo_pin(struct nouveau_bo *nvbo, uint32_t memtype)
goto out; goto out;
} }
if (nvbo->pin_refcnt) if (nvbo->pin_refcnt++)
goto ref_inc; goto out;
nouveau_bo_placement_set(nvbo, memtype, 0); nouveau_bo_placement_set(nvbo, memtype, 0);
/* drop pin_refcnt temporarily, so we don't trip the assertion
* in nouveau_bo_move() that makes sure we're not trying to
* move a pinned buffer
*/
nvbo->pin_refcnt--;
ret = nouveau_bo_validate(nvbo, false, false); ret = nouveau_bo_validate(nvbo, false, false);
if (ret) if (ret)
goto out; goto out;
nvbo->pin_refcnt++;
switch (bo->mem.mem_type) { switch (bo->mem.mem_type) {
case TTM_PL_VRAM: case TTM_PL_VRAM:
@ -347,8 +353,6 @@ nouveau_bo_pin(struct nouveau_bo *nvbo, uint32_t memtype)
break; break;
} }
ref_inc:
nvbo->pin_refcnt++;
out: out:
ttm_bo_unreserve(bo); ttm_bo_unreserve(bo);
return ret; return ret;