geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nouveau: fix up reloc_emit() to accept NULL target buffer 

The nvc0 gallium drivers passes NULL here to indicate to the memory manager
that a buffer is being used, but without creating an actual reloc.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
main
Ben Skeggs 2010-12-20 16:02:42 +10:00
parent 45cfb9cf08
commit bad5242a59
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
nouveau/nouveau_reloc.c
View File

@ -79,11 +79,7 @@ nouveau_reloc_emit(struct nouveau_channel *chan, struct nouveau_bo *reloc_bo,
if (!(nvbo->flags & (NOUVEAU_BO_GART | NOUVEAU_BO_VRAM))) if (!(nvbo->flags & (NOUVEAU_BO_GART | NOUVEAU_BO_VRAM)))
nvbo->flags |= (flags & (NOUVEAU_BO_GART | NOUVEAU_BO_VRAM)); nvbo->flags |= (flags & (NOUVEAU_BO_GART | NOUVEAU_BO_VRAM));
rpbbo = nouveau_bo_emit_buffer(chan, reloc_bo); /* add buffer to validation list */
if (!rpbbo)
return -ENOMEM;
nouveau_bo(reloc_bo)->pending_refcnt++;
pbbo = nouveau_bo_emit_buffer(chan, bo); pbbo = nouveau_bo_emit_buffer(chan, bo);
if (!pbbo) { if (!pbbo) {
fprintf(stderr, "buffer emit fail :(\n"); fprintf(stderr, "buffer emit fail :(\n");
@ -91,10 +87,13 @@ nouveau_reloc_emit(struct nouveau_channel *chan, struct nouveau_bo *reloc_bo,
} }
nouveau_bo(bo)->pending_refcnt++; nouveau_bo(bo)->pending_refcnt++;
if (flags & NOUVEAU_BO_VRAM) if (flags & (NOUVEAU_BO_VRAM | NOUVEAU_BO_GART)) {
domains |= NOUVEAU_GEM_DOMAIN_VRAM; if (flags & NOUVEAU_BO_VRAM)
if (flags & NOUVEAU_BO_GART) domains |= NOUVEAU_GEM_DOMAIN_VRAM;
domains |= NOUVEAU_GEM_DOMAIN_GART; if (flags & NOUVEAU_BO_GART)
domains |= NOUVEAU_GEM_DOMAIN_GART;
} else
domains |= nvbo->domain;
if (!(pbbo->valid_domains & domains)) { if (!(pbbo->valid_domains & domains)) {
fprintf(stderr, "no valid domains remain!\n"); fprintf(stderr, "no valid domains remain!\n");
@ -111,6 +110,23 @@ nouveau_reloc_emit(struct nouveau_channel *chan, struct nouveau_bo *reloc_bo,
nvbo->write_marker = 1; nvbo->write_marker = 1;
} }
/* nvc0 gallium driver uses reloc_emit() with NULL target buffer
* to inform bufmgr of a buffer's use - however, we need something
* to track, so create a reloc for now, and hope it never triggers
* (it shouldn't, constant virtual address..)..
*/
if (!reloc_bo) {
reloc_bo = nvpb->buffer[nvpb->current];
reloc_offset = 0;
reloc_ptr = NULL;
}
/* add reloc target bo to validation list, and create the reloc */
rpbbo = nouveau_bo_emit_buffer(chan, reloc_bo);
if (!rpbbo)
return -ENOMEM;
nouveau_bo(reloc_bo)->pending_refcnt++;
r = nvpb->relocs + nvpb->nr_relocs++; r = nvpb->relocs + nvpb->nr_relocs++;
r->reloc_bo_index = rpbbo - nvpb->buffers; r->reloc_bo_index = rpbbo - nvpb->buffers;
r->reloc_bo_offset = reloc_offset; r->reloc_bo_offset = reloc_offset;