summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/radeon/radeon_cs_legacy.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2009-02-23 13:32:24 +1000
committerDave Airlie <airlied@redhat.com>2009-02-23 14:04:17 +1000
commitb4a90c62134e7cf3af4ce52baa923a875ff292c1 (patch)
treeabfe5f3f0d2ab6d42ba0eab00ce336b77ff50763 /src/mesa/drivers/dri/radeon/radeon_cs_legacy.c
parentda17b36412155e0ed52b2c23eebd64662f642ac2 (diff)
radeon: fixup legacy bo/cs out of VRAM waiting.
This is similiar to the code from the F10 r300 bufmgr
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_cs_legacy.c')
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_cs_legacy.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_cs_legacy.c b/src/mesa/drivers/dri/radeon/radeon_cs_legacy.c
index aa95d86cd4..3acc206a8b 100644
--- a/src/mesa/drivers/dri/radeon/radeon_cs_legacy.c
+++ b/src/mesa/drivers/dri/radeon/radeon_cs_legacy.c
@@ -216,12 +216,15 @@ static int cs_process_relocs(struct radeon_cs *cs)
csm = (struct cs_manager_legacy*)cs->csm;
relocs = (struct cs_reloc_legacy *)cs->relocs;
+ restart:
for (i = 0; i < cs->crelocs; i++) {
for (j = 0; j < relocs[i].cindices; j++) {
uint32_t soffset, eoffset;
r = radeon_bo_legacy_validate(relocs[i].base.bo,
&soffset, &eoffset);
+ if (r == -EAGAIN)
+ goto restart;
if (r) {
fprintf(stderr, "validated %p [0x%08X, 0x%08X]\n",
relocs[i].base.bo, soffset, eoffset);
@@ -276,7 +279,6 @@ static int cs_emit(struct radeon_cs *cs)
csm->ctx->vtbl.emit_cs_header(cs, csm->ctx);
-
/* append buffer age */
if (IS_R300_CLASS(csm->ctx->radeonScreen)) {
age.scratch.cmd_type = R300_CMD_SCRATCH;