OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvc0: fix reloc domain conflict on buffer migration

Browse Source 
Occurred because the code assumed that buf->domain would remain
equal to old_domain.
This commit is contained in:
Christoph Bumiller
2011-01-08 00:29:41 +01:00
parent b2a79953a6
commit 8b2a46c0de
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gallium/drivers/nvc0/nvc0_buffer.c
View File

@@ -387,18 +387,19 @@ nvc0_buffer_fetch_data(struct nvc0_resource *buf,
/* Migrate a linear buffer (vertex, index, constants) USER -> GART -> VRAM. */ /* Migrate a linear buffer (vertex, index, constants) USER -> GART -> VRAM. */
boolean boolean
nvc0_buffer_migrate(struct nvc0_context *nvc0, nvc0_buffer_migrate(struct nvc0_context *nvc0,
struct nvc0_resource *buf, unsigned domain) struct nvc0_resource *buf, const unsigned new_domain)
{ {
struct nvc0_screen *screen = nvc0_screen(buf->base.screen); struct nvc0_screen *screen = nvc0_screen(buf->base.screen);
struct nouveau_bo *bo; struct nouveau_bo *bo;
const unsigned old_domain = buf->domain;
unsigned size = buf->base.width0; unsigned size = buf->base.width0;
unsigned offset; unsigned offset;
int ret; int ret;
assert(domain != buf->domain); assert(new_domain != old_domain);
if (domain == NOUVEAU_BO_GART && buf->domain == 0) { if (new_domain == NOUVEAU_BO_GART && old_domain == 0) {
if (!nvc0_buffer_allocate(screen, buf, domain)) if (!nvc0_buffer_allocate(screen, buf, new_domain))
return FALSE; return FALSE;
ret = nouveau_bo_map_range(buf->bo, buf->offset, size, NOUVEAU_BO_WR | ret = nouveau_bo_map_range(buf->bo, buf->offset, size, NOUVEAU_BO_WR |
NOUVEAU_BO_NOSYNC); NOUVEAU_BO_NOSYNC);
@@ -408,10 +409,10 @@ nvc0_buffer_migrate(struct nvc0_context *nvc0,
nouveau_bo_unmap(buf->bo); nouveau_bo_unmap(buf->bo);
FREE(buf->data); FREE(buf->data);
} else } else
if (domain != 0 && buf->domain != 0) { if (old_domain != 0 && new_domain != 0) {
struct nvc0_mm_allocation *mm = buf->mm; struct nvc0_mm_allocation *mm = buf->mm;
if (domain == NOUVEAU_BO_VRAM) { if (new_domain == NOUVEAU_BO_VRAM) {
/* keep a system memory copy of our data in case we hit a fallback */ /* keep a system memory copy of our data in case we hit a fallback */
if (!nvc0_buffer_fetch_data(buf, buf->bo, buf->offset, size)) if (!nvc0_buffer_fetch_data(buf, buf->bo, buf->offset, size))
return FALSE; return FALSE;
@@ -422,16 +423,16 @@ nvc0_buffer_migrate(struct nvc0_context *nvc0,
bo = buf->bo; bo = buf->bo;
buf->bo = NULL; buf->bo = NULL;
buf->mm = NULL; buf->mm = NULL;
nvc0_buffer_allocate(screen, buf, domain); nvc0_buffer_allocate(screen, buf, new_domain);
nvc0_m2mf_copy_linear(nvc0, buf->bo, buf->offset, domain, nvc0_m2mf_copy_linear(nvc0, buf->bo, buf->offset, new_domain,
bo, offset, buf->domain, buf->base.width0); bo, offset, old_domain, buf->base.width0);
nouveau_bo_ref(NULL, &bo); nouveau_bo_ref(NULL, &bo);
if (mm) if (mm)
release_allocation(&mm, screen->fence.current); release_allocation(&mm, screen->fence.current);
} else } else
if (domain == NOUVEAU_BO_VRAM && buf->domain == 0) { if (new_domain == NOUVEAU_BO_VRAM && old_domain == 0) {
if (!nvc0_buffer_allocate(screen, buf, NOUVEAU_BO_VRAM)) if (!nvc0_buffer_allocate(screen, buf, NOUVEAU_BO_VRAM))
return FALSE; return FALSE;
if (!nvc0_buffer_upload(nvc0, buf, 0, buf->base.width0)) if (!nvc0_buffer_upload(nvc0, buf, 0, buf->base.width0))
@@ -439,8 +440,7 @@ nvc0_buffer_migrate(struct nvc0_context *nvc0,
} else } else
return FALSE; return FALSE;
buf->domain = domain; assert(buf->domain == new_domain);
return TRUE; return TRUE;
} }